From 2d5f8b420153625115244d910f2fe597f733eb22 Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@mac.com>
Date: Wed, 3 Nov 2010 02:54:51 +0000
Subject: [PATCH] When setting a tied check if it's already tied. If it's tied
 to another constraint it's invalid. Fixes PR3905.

llvm-svn: 118146
---
 clang/lib/Basic/TargetInfo.cpp | 10 ++++++++++
 clang/test/Sema/asm.c          | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp
index 947cbfc3f6d2..1437a4ba015c 100644
--- a/clang/lib/Basic/TargetInfo.cpp
+++ b/clang/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/clang/test/Sema/asm.c b/clang/test/Sema/asm.c
index 73d081ddd385..814849037911 100644
--- a/clang/test/Sema/asm.c
+++ b/clang/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}}
 }