diff options
| -rw-r--r-- | lib/Basic/TargetInfo.cpp | 10 | ||||
| -rw-r--r-- | test/Sema/asm.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/Basic/TargetInfo.cpp b/lib/Basic/TargetInfo.cpp index 947cbfc3f6..1437a4ba01 100644 --- a/lib/Basic/TargetInfo.cpp +++ b/lib/Basic/TargetInfo.cpp @@ -354,6 +354,11 @@ bool TargetInfo::validateInputConstraint(ConstraintInfo *OutputConstraints, if (OutputConstraints[i].isReadWrite()) return false; + // If the constraint is already tied, it must be tied to the + // same operand referenced to by the number. + if (Info.hasTiedOperand() && Info.getTiedOperand() != i) + return false; + // The constraint should have the same info as the respective // output constraint. Info.setTiedOperand(i, OutputConstraints[i]); @@ -369,6 +374,11 @@ bool TargetInfo::validateInputConstraint(ConstraintInfo *OutputConstraints, if (!resolveSymbolicName(Name, OutputConstraints, NumOutputs, Index)) return false; + // If the constraint is already tied, it must be tied to the + // same operand referenced to by the number. + if (Info.hasTiedOperand() && Info.getTiedOperand() != Index) + return false; + Info.setTiedOperand(Index, OutputConstraints[Index]); break; } diff --git a/test/Sema/asm.c b/test/Sema/asm.c index 73d081ddd3..8148490379 100644 --- a/test/Sema/asm.c +++ b/test/Sema/asm.c @@ -81,7 +81,13 @@ int test7(unsigned long long b) { asm volatile (""); // expected-warning {{meaningless 'volatile' on asm outside function}} // PR3904 -int test8(int i) { +void test8(int i) { // A number in an input constraint can't point to a read-write constraint. - asm ("" : "+r" (i), "=r"(i) : "0" (i)); // expected-error{{invalid input constraint '0' in asm}} + asm("" : "+r" (i), "=r"(i) : "0" (i)); // expected-error{{invalid input constraint '0' in asm}} +} + +// PR3905 +void test9(int i) { + asm("" : [foo] "=r" (i), "=r"(i) : "1[foo]"(i)); // expected-error{{invalid input constraint '1[foo]' in asm}} + asm("" : [foo] "=r" (i), "=r"(i) : "[foo]1"(i)); // expected-error{{invalid input constraint '[foo]1' in asm}} } |