[llvm-branch-commits] [llvm-branch] r227323 - Merging r227260:

[Hans Wennborg]

Author: hans
Date: Wed Jan 28 11:22:20 2015
New Revision: 227323

URL: http://llvm.org/viewvc/llvm-project?rev=227323&view=rev
Log:
Merging r227260:
------------------------------------------------------------------------
r227260 | compnerd | 2015-01-27 14:57:35 -0800 (Tue, 27 Jan 2015) | 4 lines

SymbolRewriter: prevent unnecessary rewrite

The rewrite for the pattern based rewrite is unnecessary if the existing name
matches the pattern.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_36/   (props changed)
    llvm/branches/release_36/lib/Transforms/Utils/SymbolRewriter.cpp

Propchange: llvm/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 11:22:20 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226170-226171,226182,226473,226664,226708,226711,226755,227005
+/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226170-226171,226182,226473,226664,226708,226711,226755,227005,227260

Modified: llvm/branches/release_36/lib/Transforms/Utils/SymbolRewriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/lib/Transforms/Utils/SymbolRewriter.cpp?rev=227323&r1=227322&r2=227323&view=diff
==============================================================================
--- llvm/branches/release_36/lib/Transforms/Utils/SymbolRewriter.cpp (original)
+++ llvm/branches/release_36/lib/Transforms/Utils/SymbolRewriter.cpp Wed Jan 28 11:22:20 2015
@@ -145,6 +145,9 @@ performOnModule(Module &M) {
       report_fatal_error("unable to transforn " + C.getName() + " in " +
                          M.getModuleIdentifier() + ": " + Error);
 
+    if (C.getName() == Name)
+      continue;
+
     if (Value *V = (M.*Get)(Name))
       C.setValueName(V->getValueName());
     else