<div dir="ltr">On Tue, Jan 27, 2015 at 2:57 PM, Saleem Abdulrasool <span dir="ltr"><<a href="mailto:compnerd@compnerd.org" target="_blank">compnerd@compnerd.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Tue Jan 27 16:57:39 2015<br>
New Revision: 227261<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=227261&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=227261&view=rev</a><br>
Log:<br>
SymbolRewriter: allow rewriting with comdats<br>
<br>
COMDATs must be identically named to the symbol. When support for COMDATs was<br>
introduced, the symbol rewriter was not updated, resulting in rewriting failing<br>
for symbols which were placed into COMDATs. This corrects the behaviour and<br>
adds test cases for this.<br></blockquote><div><br></div><div>Hi Hans,</div><div><br></div><div>I think we should merge this and the prior change (227260) for the 3.6 release as it makes this unusable in many cases after the support for comdats was added near the end of the branch point.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Modified:<br>
llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp<br>
llvm/trunk/test/SymbolRewriter/rewrite.ll<br>
llvm/trunk/test/SymbolRewriter/rewrite.map<br>
<br>
Modified: llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp?rev=227261&r1=227260&r2=227261&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp?rev=227261&r1=227260&r2=227261&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp Tue Jan 27 16:57:39 2015<br>
@@ -79,6 +79,19 @@ static cl::list<std::string> RewriteMapF<br>
<br>
namespace llvm {<br>
namespace SymbolRewriter {<br>
+void rewriteComdat(Module &M, GlobalObject *GO, const std::string &Source,<br>
+ const std::string &Target) {<br>
+ if (Comdat *CD = GO->getComdat()) {<br>
+ auto &Comdats = M.getComdatSymbolTable();<br>
+<br>
+ Comdat *C = M.getOrInsertComdat(Target);<br>
+ C->setSelectionKind(CD->getSelectionKind());<br>
+ GO->setComdat(C);<br>
+<br>
+ Comdats.erase(Comdats.find(Source));<br>
+ }<br>
+}<br>
+<br>
template <RewriteDescriptor::Type DT, typename ValueType,<br>
ValueType *(llvm::Module::*Get)(StringRef) const><br>
class ExplicitRewriteDescriptor : public RewriteDescriptor {<br>
@@ -102,10 +115,14 @@ template <RewriteDescriptor::Type DT, ty<br>
bool ExplicitRewriteDescriptor<DT, ValueType, Get>::performOnModule(Module &M) {<br>
bool Changed = false;<br>
if (ValueType *S = (M.*Get)(Source)) {<br>
+ if (GlobalObject *GO = dyn_cast<GlobalObject>(S))<br>
+ rewriteComdat(M, GO, Source, Target);<br>
+<br>
if (Value *T = (M.*Get)(Target))<br>
S->setValueName(T->getValueName());<br>
else<br>
S->setName(Target);<br>
+<br>
Changed = true;<br>
}<br>
return Changed;<br>
@@ -148,6 +165,9 @@ performOnModule(Module &M) {<br>
if (C.getName() == Name)<br>
continue;<br>
<br>
+ if (GlobalObject *GO = dyn_cast<GlobalObject>(&C))<br>
+ rewriteComdat(M, GO, C.getName(), Name);<br>
+<br>
if (Value *V = (M.*Get)(Name))<br>
C.setValueName(V->getValueName());<br>
else<br>
<br>
Modified: llvm/trunk/test/SymbolRewriter/rewrite.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/SymbolRewriter/rewrite.ll?rev=227261&r1=227260&r2=227261&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/SymbolRewriter/rewrite.ll?rev=227261&r1=227260&r2=227261&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/SymbolRewriter/rewrite.ll (original)<br>
+++ llvm/trunk/test/SymbolRewriter/rewrite.ll Tue Jan 27 16:57:39 2015<br>
@@ -28,12 +28,40 @@ entry:<br>
ret void<br>
}<br>
<br>
+$source_comdat_function = comdat any<br>
+define dllexport void @source_comdat_function() comdat($source_comdat_function) {<br>
+entry:<br>
+ ret void<br>
+}<br>
+<br>
+$source_comdat_function_1 = comdat exactmatch<br>
+define dllexport void @source_comdat_function_1() comdat($source_comdat_function_1) {<br>
+entry:<br>
+ ret void<br>
+}<br>
+<br>
+$source_comdat_variable = comdat largest<br>
+@source_comdat_variable = global i32 32, comdat($source_comdat_variable)<br>
+<br>
+$source_comdat_variable_1 = comdat noduplicates<br>
+@source_comdat_variable_1 = global i32 64, comdat($source_comdat_variable_1)<br>
+<br>
+; CHECK: $target_comdat_function = comdat any<br>
+; CHECK: $target_comdat_function_1 = comdat exactmatch<br>
+; CHECK: $target_comdat_variable = comdat largest<br>
+; CHECK: $target_comdat_variable_1 = comdat noduplicates<br>
+<br>
; CHECK: @target_variable = external global i32<br>
; CHECK-NOT: @source_variable = external global i32<br>
; CHECK: @target_pattern_variable = external global i32<br>
; CHECK-NOT: @source_pattern_variable = external global i32<br>
; CHECK: @target_pattern_multiple_variable_matches = external global i32<br>
; CHECK-NOT: @source_pattern_multiple_variable_matches = external global i32<br>
+; CHECK: @target_comdat_variable = global i32 32, comdat<br>
+; CHECK-NOT: @source_comdat_variable = global i32 32, comdat<br>
+; CHECK: @target_comdat_variable_1 = global i32 64, comdat<br>
+; CHECK-NOT: @source_comdat_variable_1 = global i32 64, comdat<br>
+<br>
; CHECK: declare void @target_function()<br>
; CHECK-NOT: declare void @source_function()<br>
; CHECK: declare void @target_pattern_function()<br>
@@ -57,3 +85,8 @@ entry:<br>
; CHECK: ret i32 %res<br>
; CHECK: }<br>
<br>
+; CHECK: define dllexport void @target_comdat_function() comdat<br>
+; CHECK-NOT: define dllexport void @source_comdat_function() comdat<br>
+; CHECK: define dllexport void @target_comdat_function_1() comdat<br>
+; CHECK-NOT: define dllexport void @source_comdat_function_1() comdat<br>
+<br>
<br>
Modified: llvm/trunk/test/SymbolRewriter/rewrite.map<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/SymbolRewriter/rewrite.map?rev=227261&r1=227260&r2=227261&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/SymbolRewriter/rewrite.map?rev=227261&r1=227260&r2=227261&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/SymbolRewriter/rewrite.map (original)<br>
+++ llvm/trunk/test/SymbolRewriter/rewrite.map Tue Jan 27 16:57:39 2015<br>
@@ -44,3 +44,23 @@ global alias: {<br>
target: _ZN1SD1Ev,<br>
}<br>
<br>
+function: {<br>
+ source: source_comdat_function,<br>
+ target: target_comdat_function,<br>
+}<br>
+<br>
+function: {<br>
+ source: source_comdat_function_(.*),<br>
+ transform: target_comdat_function_\1,<br>
+}<br>
+<br>
+global variable: {<br>
+ source: source_comdat_variable,<br>
+ target: target_comdat_variable,<br>
+}<br>
+<br>
+global variable: {<br>
+ source: source_comdat_variable_(.*),<br>
+ transform: target_comdat_variable_\1,<br>
+}<br>
+<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature">Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org</div>
</div></div>