[llvm-branch-commits] [llvm-branch] r100017 - in /llvm/branches/Apple/Morbo: ./ lib/Target/X86/SSEDomainFix.cpp lib/Transforms/IPO/FunctionAttrs.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Wed Mar 31 12:15:20 2010
New Revision: 100017

URL: http://llvm.org/viewvc/llvm-project?rev=100017&view=rev
Log:
--- Merging r100016 into '.':
U    lib/Target/X86/SSEDomainFix.cpp


Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp
    llvm/branches/Apple/Morbo/lib/Transforms/IPO/FunctionAttrs.cpp   (props changed)

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 31 12:15:20 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99455,99463,99465,99469,99484,99490,99492-99494,99524,99537,99539-99540,99544,99570,99575,99629-99630,99671,99692,99695,99697,99699,99722,99846,99848,99850,99855,99910,99916,99952-99954,99957,99959,99974-99975
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99455,99463,99465,99469,99484,99490,99492-99494,99524,99537,99539-99540,99544,99570,99575,99629-99630,99671,99692,99695,99697,99699,99722,99846,99848,99850,99855,99910,99916,99952-99954,99957,99959,99974-99975,100016

Modified: llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp?rev=100017&r1=100016&r2=100017&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp Wed Mar 31 12:15:20 2010
@@ -261,6 +261,8 @@
 bool SSEDomainFixPass::Merge(DomainValue *A, DomainValue *B) {
   assert(!A->collapsed() && "Cannot merge into collapsed");
   assert(!B->collapsed() && "Cannot merge from collapsed");
+	if (A == B)
+    return true;
   if (!A->compat(B->Mask))
     return false;
   A->Mask &= B->Mask;

Propchange: llvm/branches/Apple/Morbo/lib/Transforms/IPO/FunctionAttrs.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 31 12:15:20 2010
@@ -1 +1 @@
-/llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp:99492,99524,99539-99540,99699,99836,99846,99848,99850,99855,99910,99916,99952-99954,99957,99959,99974-99975
+/llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp:99492,99524,99539-99540,99699,99836,99846,99848,99850,99855,99910,99916,99952-99954,99957,99959,99974-99975,100016