r225606 - Basic: Numeric constraints are multidigit
David Majnemer
david.majnemer at gmail.com
Sun Jan 11 02:22:41 PST 2015
Author: majnemer
Date: Sun Jan 11 04:22:41 2015
New Revision: 225606
URL: http://llvm.org/viewvc/llvm-project?rev=225606&view=rev
Log:
Basic: Numeric constraints are multidigit
Clang would treat the digits in an "11m" input constraint separately as
if it was handling constraint 1 twice instead of constraint 11.
Modified:
cfe/trunk/lib/Basic/TargetInfo.cpp
cfe/trunk/test/Sema/asm.c
Modified: cfe/trunk/lib/Basic/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/TargetInfo.cpp?rev=225606&r1=225605&r2=225606&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/TargetInfo.cpp (original)
+++ cfe/trunk/lib/Basic/TargetInfo.cpp Sun Jan 11 04:22:41 2015
@@ -548,11 +548,17 @@ bool TargetInfo::validateInputConstraint
default:
// Check if we have a matching constraint
if (*Name >= '0' && *Name <= '9') {
- unsigned i = *Name - '0';
+ const char *DigitStart = Name;
+ while (Name[1] >= '0' && Name[1] <= '9')
+ Name++;
+ const char *DigitEnd = Name;
+ unsigned i;
+ if (StringRef(DigitStart, DigitEnd - DigitStart + 1)
+ .getAsInteger(10, i))
+ return false;
// Check if matching constraint is out of bounds.
- if (i >= NumOutputs)
- return false;
+ if (i >= NumOutputs) return false;
// A number must refer to an output only operand.
if (OutputConstraints[i].isReadWrite())
Modified: cfe/trunk/test/Sema/asm.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/asm.c?rev=225606&r1=225605&r2=225606&view=diff
==============================================================================
--- cfe/trunk/test/Sema/asm.c (original)
+++ cfe/trunk/test/Sema/asm.c Sun Jan 11 04:22:41 2015
@@ -197,3 +197,10 @@ void fn5() {
: [g] "+r"(l)
: "[g]"(l)); // expected-error {{invalid input constraint '[g]' in asm}}
}
+
+void fn6() {
+ int a;
+ __asm__(""
+ : "=rm"(a), "=rm"(a)
+ : "11m"(a)) // expected-error {{invalid input constraint '11m' in asm}}
+}
More information about the cfe-commits
mailing list