[llvm-branch-commits] [llvm-branch] r143999 - in /llvm/branches/release_30: ./ lib/Target/CppBackend/CPPBackend.cpp

[Bill Wendling]

Author: void
Date: Mon Nov  7 13:38:25 2011
New Revision: 143999

URL: http://llvm.org/viewvc/llvm-project?rev=143999&view=rev
Log:
Merging r143712:
------------------------------------------------------------------------
r143712 | efriedma | 2011-11-04 10:29:35 -0700 (Fri, 04 Nov 2011) | 3 lines

Add missing argument for atomic instructions in c++ backend.  PR11268, part 2.


------------------------------------------------------------------------

Modified:
    llvm/branches/release_30/   (props changed)
    llvm/branches/release_30/lib/Target/CppBackend/CPPBackend.cpp

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 13:38:25 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806,142841,142869,142956,142994,142998,143006,143159,143194,143222,143247,143290,143302-143303,143328,143348-143349,143406,143437
+/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806,142841,142869,142956,142994,142998,143006,143159,143194,143222,143247,143290,143302-143303,143328,143348-143349,143406,143437,143712

Modified: llvm/branches/release_30/lib/Target/CppBackend/CPPBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/lib/Target/CppBackend/CPPBackend.cpp?rev=143999&r1=143998&r2=143999&view=diff
==============================================================================
--- llvm/branches/release_30/lib/Target/CppBackend/CPPBackend.cpp (original)
+++ llvm/branches/release_30/lib/Target/CppBackend/CPPBackend.cpp Mon Nov  7 13:38:25 2011
@@ -1492,7 +1492,7 @@
     StringRef CrossThread = ConvertAtomicSynchScope(fi->getSynchScope());
     Out << "FenceInst* " << iName
         << " = new FenceInst(mod->getContext(), "
-        << Ordering << ", " << CrossThread
+        << Ordering << ", " << CrossThread << ", " << bbname
         << ");";
     break;
   }
@@ -1503,7 +1503,7 @@
     Out << "AtomicCmpXchgInst* " << iName
         << " = new AtomicCmpXchgInst("
         << opNames[0] << ", " << opNames[1] << ", " << opNames[2] << ", "
-        << Ordering << ", " << CrossThread
+        << Ordering << ", " << CrossThread << ", " << bbname
         << ");";
     nl(Out) << iName << "->setName(\"";
     printEscapedString(cxi->getName());
@@ -1533,7 +1533,7 @@
         << " = new AtomicRMWInst("
         << Operation << ", "
         << opNames[0] << ", " << opNames[1] << ", "
-        << Ordering << ", " << CrossThread
+        << Ordering << ", " << CrossThread << ", " << bbname
         << ");";
     nl(Out) << iName << "->setName(\"";
     printEscapedString(rmwi->getName());