[llvm-branch-commits] [llvm-gcc-branch] r102750 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/llvm-debug.cpp

[Devang Patel]

Author: dpatel
Date: Fri Apr 30 14:55:03 2010
New Revision: 102750

URL: http://llvm.org/viewvc/llvm-project?rev=102750&view=rev
Log:
Merge from trunk.
r102745

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 30 14:55:03 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102636,102648
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102636,102648,102745

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp?rev=102750&r1=102749&r2=102750&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp Fri Apr 30 14:55:03 2010
@@ -365,8 +365,8 @@
                                   FNType,
                                   Fn->hasInternalLinkage(),
                                   true /*definition*/,
-                                  Virtuality, VIndex, ContainingType);
-                          
+                                  Virtuality, VIndex, ContainingType,
+                                  DECL_ARTIFICIAL (FnDecl), optimize);
 
   SPCache[FnDecl] = WeakVH(SP.getNode());
 
@@ -1015,7 +1015,7 @@
                                       getOrCreateFile(MemLoc.file),
                                       MemLoc.line, SPTy, false, false,
                                       Virtuality, VIndex, ContainingType,
-                                      DECL_ARTIFICIAL (Member));
+                                      DECL_ARTIFICIAL (Member), optimize);
       EltTys.push_back(SP);
       SPCache[Member] = WeakVH(SP.getNode());
     }