diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index c871b7b..382b186 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -519,7 +519,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.
diff --git a/test/CodeGenObjC/debug-info.m b/test/CodeGenObjC/debug-info.m
index c4b9426..9c461ba 100644
--- a/test/CodeGenObjC/debug-info.m
+++ b/test/CodeGenObjC/debug-info.m
@@ -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
-@implementation A
+@implementation A // Line 15
 -(void) m0 {}
 @end