This is an archive of the discontinued LLVM Phabricator instance.

[ASan][MSan] Remove EmptyAsm and set the CallInst to nomerge to avoid from merging.
ClosedPublic

Authored by zequanwu on Jun 22 2020, 11:52 AM.

Details

Summary

nomerge attribute was added at D78659. So, we can remove the EmptyAsm workaround in ASan the MSan and use this attribute.

Diff Detail

Event Timeline

zequanwu created this revision.Jun 22 2020, 11:52 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 22 2020, 11:52 AM
zequanwu updated this revision to Diff 272515.Jun 22 2020, 12:16 PM

Update with SanitizerCoverage.

vitalybuka accepted this revision.Jun 23 2020, 1:46 PM
vitalybuka added inline comments.
llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
1082–1083

HasNonEmptyInlineAsm -> HasInlineAsm

This revision is now accepted and ready to land.Jun 23 2020, 1:46 PM
zequanwu updated this revision to Diff 272827.Jun 23 2020, 2:21 PM

address comments.

zequanwu marked an inline comment as done.Jun 23 2020, 2:22 PM
This revision was automatically updated to reflect the committed changes.

It looks like this broke the s390x build bots, since then I'm seeing a lot of ASan and MSan errors:
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33485

It looks like this broke the s390x build bots, since then I'm seeing a lot of ASan and MSan errors:
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33485

It seems like all those tests failed because the second CHECK should match output line 4 but missing the line number at the end.
Since the patch passed tests in all other build bots, I wonder if it's because the build bot config is flaky.

uweigand added a subscriber: iii.Jun 29 2020, 10:28 AM

It looks like this broke the s390x build bots, since then I'm seeing a lot of ASan and MSan errors:
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33485

It seems like all those tests failed because the second CHECK should match output line 4 but missing the line number at the end.
Since the patch passed tests in all other build bots, I wonder if it's because the build bot config is flaky.

@iii had a look and it appears the problem is that this patch https://reviews.llvm.org/D79537 didn't add support on SystemZ, so we get wrong line numbers when merging happens. Ilya is working on a patch.

It looks like this broke the s390x build bots, since then I'm seeing a lot of ASan and MSan errors:
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/33485

It seems like all those tests failed because the second CHECK should match output line 4 but missing the line number at the end.
Since the patch passed tests in all other build bots, I wonder if it's because the build bot config is flaky.

@iii had a look and it appears the problem is that this patch https://reviews.llvm.org/D79537 didn't add support on SystemZ, so we get wrong line numbers when merging happens. Ilya is working on a patch.

Thanks for the fix