forked from OSchip/llvm-project
Global inline assembler blocks are merged before parsing, so no specific
location data is available. If pragma handling wants to look up the position, it finds the LLVM buffer and wants to compare it with the special built-in buffer, failing badly. Extend to the special handling of the built-in buffer to also check for the inline asm buffer. Expect only a single asm buffer. Sort it between the built-in buffers and the normal file buffers. Fixes the assert part of PR 22576. llvm-svn: 232389
This commit is contained in:
parent
f2929c9b03
commit
1d3b431c98
|
@ -2076,22 +2076,33 @@ bool SourceManager::isBeforeInTranslationUnit(SourceLocation LHS,
|
||||||
return IsBeforeInTUCache.getCachedResult(LOffs.second, ROffs.second);
|
return IsBeforeInTUCache.getCachedResult(LOffs.second, ROffs.second);
|
||||||
}
|
}
|
||||||
|
|
||||||
// This can happen if a location is in a built-ins buffer.
|
// If we arrived here, the location is either in a built-ins buffer or
|
||||||
// But see PR5662.
|
// associated with global inline asm. PR5662 and PR22576 are examples.
|
||||||
|
|
||||||
// Clear the lookup cache, it depends on a common location.
|
// Clear the lookup cache, it depends on a common location.
|
||||||
IsBeforeInTUCache.clear();
|
IsBeforeInTUCache.clear();
|
||||||
bool LIsBuiltins = strcmp("<built-in>",
|
llvm::MemoryBuffer *LBuf = getBuffer(LOffs.first);
|
||||||
getBuffer(LOffs.first)->getBufferIdentifier()) == 0;
|
llvm::MemoryBuffer *RBuf = getBuffer(ROffs.first);
|
||||||
bool RIsBuiltins = strcmp("<built-in>",
|
bool LIsBuiltins = strcmp("<built-in>", LBuf->getBufferIdentifier()) == 0;
|
||||||
getBuffer(ROffs.first)->getBufferIdentifier()) == 0;
|
bool RIsBuiltins = strcmp("<built-in>", RBuf->getBufferIdentifier()) == 0;
|
||||||
// built-in is before non-built-in
|
// Sort built-in before non-built-in.
|
||||||
if (LIsBuiltins != RIsBuiltins)
|
if (LIsBuiltins || RIsBuiltins) {
|
||||||
return LIsBuiltins;
|
if (LIsBuiltins != RIsBuiltins)
|
||||||
assert(LIsBuiltins && RIsBuiltins &&
|
return LIsBuiltins;
|
||||||
"Non-built-in locations must be rooted in the main file");
|
// Both are in built-in buffers, but from different files. We just claim that
|
||||||
// Both are in built-in buffers, but from different files. We just claim that
|
// lower IDs come first.
|
||||||
// lower IDs come first.
|
return LOffs.first < ROffs.first;
|
||||||
return LOffs.first < ROffs.first;
|
}
|
||||||
|
bool LIsAsm = strcmp("<inline asm>", LBuf->getBufferIdentifier()) == 0;
|
||||||
|
bool RIsAsm = strcmp("<inline asm>", RBuf->getBufferIdentifier()) == 0;
|
||||||
|
// Sort assembler after built-ins, but before the rest.
|
||||||
|
if (LIsAsm || RIsAsm) {
|
||||||
|
if (LIsAsm != RIsAsm)
|
||||||
|
return RIsAsm;
|
||||||
|
assert(LOffs.first == ROffs.first);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
llvm_unreachable("Unsortable locations found");
|
||||||
}
|
}
|
||||||
|
|
||||||
void SourceManager::PrintStats() const {
|
void SourceManager::PrintStats() const {
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
// REQUIRES: arm-registered-target
|
||||||
|
// RUN: not %clang_cc1 -emit-obj -triple armv6-unknown-unknown -o %t %s 2>&1 | FileCheck %s
|
||||||
|
#pragma clang diagnostic ignored "-Wmissing-noreturn"
|
||||||
|
__asm__(".Lfoo: movw r2, #:lower16:.Lbar - .Lfoo");
|
||||||
|
// CHECK: <inline asm>:1:8: error: instruction requires: armv6t2
|
Loading…
Reference in New Issue