[llvm-branch-commits] [cfe-branch] r72053 - in /cfe/branches/Apple/Dib: lib/CodeGen/CGDebugInfo.cpp test/CodeGenObjC/debug-info.m

[Mike Stump]

Author: mrs
Date: Mon May 18 17:25:50 2009
New Revision: 72053

URL: http://llvm.org/viewvc/llvm-project?rev=72053&view=rev
Log:
Merge in 72036:

Debug info: Initialize runtime language field correctly for Objective-C
interface types.

Modified:
    cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp
    cfe/branches/Apple/Dib/test/CodeGenObjC/debug-info.m

Modified: cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp?rev=72053&r1=72052&r2=72053&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp (original)
+++ cfe/branches/Apple/Dib/lib/CodeGen/CGDebugInfo.cpp Mon May 18 17:25:50 2009
@@ -391,7 +391,7 @@
   unsigned Line = PLoc.isInvalid() ? 0 : PLoc.getLine();
 
   
-  unsigned RuntimeLang = DefUnit.getRunTimeVersion();
+  unsigned RuntimeLang = DefUnit.getLanguage();
 
   // To handle recursive interface, we
   // first generate a debug descriptor for the struct as a forward declaration.

Modified: cfe/branches/Apple/Dib/test/CodeGenObjC/debug-info.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/CodeGenObjC/debug-info.m?rev=72053&r1=72052&r2=72053&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/test/CodeGenObjC/debug-info.m (original)
+++ cfe/branches/Apple/Dib/test/CodeGenObjC/debug-info.m Mon May 18 17:25:50 2009
@@ -2,9 +2,17 @@
 // RUN: grep '@.str3 = internal constant \[8 x i8\] c"-\[A m0\]\\00"' %t &&
 // RUN: grep '@.str4 = internal constant \[9 x i8\] c"\\01-\[A m0\]\\00"' %t &&
 // RUN: grep '@llvm.dbg.subprogram = .* @.str3, .* @.str3, .* @.str4,' %t &&
+// RUN: grep '@llvm.dbg.composite.* = .* i32 15, i64 0, i64 8, .* i32 16' %t &&
 // RUN: true
 
+
+
+
+
+
+
+
 @interface A @end
- at implementation A
+ at implementation A // Line 15
 -(void) m0 {}
 @end