commit 1576850a7636fd7b4b77ea31762b58fb140ac969
author Chris Lattner <sabre@nondot.org> Sun Dec 20 23:08:04 2009 +0000
committer Chris Lattner <sabre@nondot.org> Sun Dec 20 23:08:04 2009 +0000
tree 2718cc9c124377beefeac638ef950255e9462297
parent bf5fff5fbba7aa9e4815607f4cbc7587372eda08

fix PR5500: clang fails to parse inline asm with :: in C++ mode 

llvm-svn: 91802

clang/lib/Parse/ParseStmt.cpp

diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index c3595b9..9085b87 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -1259,18 +1259,32 @@
   }
 
   // Parse Outputs, if present.
-  if (Tok.is(tok::colon)) {
+  bool AteExtraColon = false;
+  if (Tok.is(tok::colon) || Tok.is(tok::coloncolon)) {
+    // In C++ mode, parse "::" like ": :".
+    AteExtraColon = Tok.is(tok::coloncolon);
     ConsumeToken();
   
-    if (ParseAsmOperandsOpt(Names, Constraints, Exprs))
+    if (!AteExtraColon &&
+        ParseAsmOperandsOpt(Names, Constraints, Exprs))
       return StmtError();
   }
+  
   unsigned NumOutputs = Names.size();
 
   // Parse Inputs, if present.
-  if (Tok.is(tok::colon)) {
-    ConsumeToken();
-    if (ParseAsmOperandsOpt(Names, Constraints, Exprs))
+  if (AteExtraColon ||
+      Tok.is(tok::colon) || Tok.is(tok::coloncolon)) {
+    // In C++ mode, parse "::" like ": :".
+    if (AteExtraColon)
+      AteExtraColon = false;
+    else {
+      AteExtraColon = Tok.is(tok::coloncolon);
+      ConsumeToken();
+    }
+    
+    if (!AteExtraColon &&
+        ParseAsmOperandsOpt(Names, Constraints, Exprs))
       return StmtError();
   }
 
@@ -1281,8 +1295,9 @@
   unsigned NumInputs = Names.size() - NumOutputs;
 
   // Parse the clobbers, if present.
-  if (Tok.is(tok::colon)) {
-    ConsumeToken();
+  if (AteExtraColon || Tok.is(tok::colon)) {
+    if (!AteExtraColon)
+      ConsumeToken();
 
     // Parse the asm-string list for clobbers.
     while (1) {