[llvm-commits] [polly] r159649 - /polly/trunk/utils/0001-Add-llvm.codegen-intrinsic.patch

[Tobias Grosser]

Author: grosser
Date: Tue Jul  3 03:18:31 2012
New Revision: 159649

URL: http://llvm.org/viewvc/llvm-project?rev=159649&view=rev
Log:
Update to Polly for LLVM r159614 which changes Passes.cpp.

Contributed by: Yabin Hu <yabin.hwu at gmail.com>

Modified:
    polly/trunk/utils/0001-Add-llvm.codegen-intrinsic.patch

Modified: polly/trunk/utils/0001-Add-llvm.codegen-intrinsic.patch
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/utils/0001-Add-llvm.codegen-intrinsic.patch?rev=159649&r1=159648&r2=159649&view=diff
==============================================================================
--- polly/trunk/utils/0001-Add-llvm.codegen-intrinsic.patch (original)
+++ polly/trunk/utils/0001-Add-llvm.codegen-intrinsic.patch Tue Jul  3 03:18:31 2012
@@ -1,6 +1,6 @@
-From 1bad885275c602bb285c162d8d619ab3ac5a594f Mon Sep 17 00:00:00 2001
+From ac671e78f9fc4481263f6849d5e392ec06e43164 Mon Sep 17 00:00:00 2001
 From: Yabin Hu <yabin.hwu at gmail.com>
-Date: Sat, 30 Jun 2012 10:54:52 +0800
+Date: Tue, 3 Jul 2012 11:21:45 +0800
 Subject: [PATCH] Add llvm.codegen intrinsic.
 
 The llvm.codegen intrinsic generates code for embedded LLVM-IR
@@ -81,10 +81,10 @@
  
  <!-- ======================================================================= -->
 diff --git a/include/llvm/CodeGen/Passes.h b/include/llvm/CodeGen/Passes.h
-index 206bc2e..94cb65b 100644
+index 4a24ab0..2375222 100644
 --- a/include/llvm/CodeGen/Passes.h
 +++ b/include/llvm/CodeGen/Passes.h
-@@ -395,6 +395,9 @@ namespace llvm {
+@@ -419,6 +419,9 @@ namespace llvm {
    /// branch folding).
    extern char &GCMachineCodeAnalysisID;
  
@@ -381,21 +381,21 @@
 +  return MadeChange;
 +}
 diff --git a/lib/CodeGen/Passes.cpp b/lib/CodeGen/Passes.cpp
-index bf244a5..ed77c60 100644
+index 9693780..db91bbe 100644
 --- a/lib/CodeGen/Passes.cpp
 +++ b/lib/CodeGen/Passes.cpp
-@@ -332,6 +332,9 @@ void TargetPassConfig::addIRPasses() {
+@@ -354,6 +354,9 @@ void TargetPassConfig::addIRPasses() {
  
-   PM->add(createGCLoweringPass());
+   addPass(createGCLoweringPass());
  
 +  // Generate target code for embedded LLVM-IR strings.
-+  PM->add(createCodeGenIntrinsicPass());
++  addPass(createCodeGenIntrinsicPass());
 +
    // Make sure that no unreachable blocks are instruction selected.
-   PM->add(createUnreachableBlockEliminationPass());
+   addPass(createUnreachableBlockEliminationPass());
  }
 diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
-index 957d00a..35c25fe 100644
+index 42b9099..6eba1ce 100644
 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
 +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
 @@ -5185,6 +5185,8 @@ SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, unsigned Intrinsic) {