[llvm-branch-commits] [cfe-branch] r228074 - Merging r226384:

[Hans Wennborg]

Author: hans
Date: Tue Feb  3 17:58:19 2015
New Revision: 228074

URL: http://llvm.org/viewvc/llvm-project?rev=228074&view=rev
Log:
Merging r226384:
------------------------------------------------------------------------
r226384 | dblaikie | 2015-01-17 16:37:04 -0800 (Sat, 17 Jan 2015) | 1 line

Refactor test so it's not lazily emitted on a global, simplifying ordering when more test cases are added
------------------------------------------------------------------------

Modified:
    cfe/branches/release_36/   (props changed)
    cfe/branches/release_36/test/CodeGenCXX/debug-info-line.cpp

Propchange: cfe/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  3 17:58:19 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:226008,226049,226136,226282,226382,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368,227393,227979
+/cfe/trunk:226008,226049,226136,226282,226382,226384,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368,227393,227979
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_36/test/CodeGenCXX/debug-info-line.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/test/CodeGenCXX/debug-info-line.cpp?rev=228074&r1=228073&r2=228074&view=diff
==============================================================================
--- cfe/branches/release_36/test/CodeGenCXX/debug-info-line.cpp (original)
+++ cfe/branches/release_36/test/CodeGenCXX/debug-info-line.cpp Tue Feb  3 17:58:19 2015
@@ -171,15 +171,16 @@ struct f14 {
 };
 
 // CHECK-LABEL: define
-// CHECK-LABEL: define
-// CHECK-LABEL: define
-struct {
+struct f14_use {
 // CHECK: call {{.*}}, !dbg [[DBG_F14_CTOR_CALL:![0-9]*]]
 #line 1600
   f14 v
       =
       1;
-} f14_inst;
+  f14_use();
+};
+
+f14_use::f14_use() = default;
 
 // CHECK-LABEL: define