[clang] Fix label (de-)serialization in ASM statements.

[VitaNuo]

Remove template param.

[kadircet]

clang/test/PCH/asm-label.cpp

6

you can drop #pragma once know, as it won't be parsed again anyways

7

let's still make sure this crashes with current version (I know i said we can simplify it, but it looks like we don't have any assertions, and moreover it's really hard to have any without significantly changing interfaces). So let's keep the template and at least 5 different operand names:

template <int = 0> void foo() {
label:
  void *bar;
  asm goto(""
           :
           : [op1] "r"(bar), [op2] "r"(bar), [op3] "r"(bar), [op4] "r"(bar)
           :
           : label);
}

[VitaNuo]

Update test case.

clang/lib/Serialization/ASTReaderStmt.cpp

void ASTStmtReader::VisitGCCAsmStmt(GCCAsmStmt *S) {
   }
 
   // Constraints
   SmallVector<StringLiteral*, 16> Clobbers;
   for (unsigned I = 0; I != NumClobbers; ++I)
     Clobbers.push_back(cast_or_null<StringLiteral>(Record.readSubStmt()));
 
   // Labels
-  for (unsigned I = 0, N = NumLabels; I != N; ++I)
+  for (unsigned I = 0, N = NumLabels; I != N; ++I) {
+    Names.push_back(Record.readIdentifier());
     Exprs.push_back(Record.readSubStmt());
+  }
 
   S->setOutputsAndInputsAndClobbers(Record.getContext(),
                                     Names.data(), Constraints.data(),
                                     Exprs.data(), NumOutputs, NumInputs,
                                     NumLabels,
                                     Clobbers.data(), NumClobbers);
 }
 

clang/lib/Serialization/ASTWriterStmt.cpp

for (unsigned I = 0, N = S->getNumInputs(); I != N; ++I) {
     Record.AddStmt(S->getInputExpr(I));
   }
 
   // Clobbers
   for (unsigned I = 0, N = S->getNumClobbers(); I != N; ++I)
     Record.AddStmt(S->getClobberStringLiteral(I));
 
   // Labels
-  for (auto *E : S->labels()) Record.AddStmt(E);
+  for (unsigned I = 0, N = S->getNumLabels(); I != N; ++I) {
+    Record.AddIdentifierRef(S->getLabelIdentifier(I));
+    Record.AddStmt(S->getLabelExpr(I));
+  }
 
   Code = serialization::STMT_GCCASM;
 }
 
 void ASTStmtWriter::VisitMSAsmStmt(MSAsmStmt *S) {
   VisitAsmStmt(S);
   Record.AddSourceLocation(S->getLBraceLoc());
   Record.AddSourceLocation(S->getEndLoc());

clang/test/PCH/asm-label.cpp

+// RUN: %clang_cc1 -emit-pch %s -o %t
+// RUN: %clang_cc1 -include-pch %t %s -verify
+#ifndef HEADER_H
+#define HEADER_H
+template<int = 0> 
+void MyMethod() {
+  void *bar;
+  some_path:
+  asm goto
+      (
+          "mov %w[foo], %w[foo]"
+          : [foo] "=r"(bar)
+          : [foo2] "r"(bar), [foo3] "r"(bar), [foo4] "r"(bar)
+          : 
+          : some_path
+      );
+  }
+#else
+void test() {
+ MyMethod();
+// expected-no-diagnostics
+}
+#endif