[cfe-commits] r65869 - in /cfe/trunk: lib/Frontend/TextDiagnosticPrinter.cpp test/Sema/implicit-int.c

[Chris Lattner]

Author: lattner
Date: Mon Mar  2 14:58:48 2009
New Revision: 65869

URL: http://llvm.org/viewvc/llvm-project?rev=65869&view=rev
Log:
fix PR2639

Modified:
    cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp
    cfe/trunk/test/Sema/implicit-int.c

Modified: cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp?rev=65869&r1=65868&r2=65869&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp (original)
+++ cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp Mon Mar  2 14:58:48 2009
@@ -218,7 +218,7 @@
         // We have an insertion hint. Determine whether the inserted
         // code is on the same line as the caret.
         std::pair<FileID, unsigned> HintLocInfo 
-          = SM.getDecomposedLoc(Hint->InsertionLoc);
+          = SM.getDecomposedInstantiationLoc(Hint->InsertionLoc);
         if (SM.getLineNumber(HintLocInfo.first, HintLocInfo.second) ==
               SM.getLineNumber(FID, FileOffset)) {
           // Insert the new code into the line just below the code

Modified: cfe/trunk/test/Sema/implicit-int.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/implicit-int.c?rev=65869&r1=65868&r2=65869&view=diff

==============================================================================
--- cfe/trunk/test/Sema/implicit-int.c (original)
+++ cfe/trunk/test/Sema/implicit-int.c Mon Mar  2 14:58:48 2009
@@ -8,3 +8,17 @@
 // rdar://6131634
 void f((x));  // expected-warning {{type specifier missing, defaults to 'int'}}
 
+
+// PR2639
+#define PAD(ms10) { \
+	register i; \
+}
+
+#define ILPAD() PAD((NROW - tt.tt_row) * 10)	/* 1 ms per char */
+
+void
+h19_insline(n)  // expected-warning {{parameter 'n' was not declared, defaulting to type 'int'}}
+{
+	ILPAD();  // expected-warning {{type specifier missing, defaults to 'int'}}
+}
+