From 8255ceb2cf5829ce4b3e0ab72df57a8044dfa64f Mon Sep 17 00:00:00 2001
From: Nadav Rotem <nrotem@apple.com>
Date: Thu, 25 Oct 2012 23:51:48 +0000
Subject: [PATCH] Revert 166726 because it may have broken a number of SPEC
 tests. PR14183.

llvm-svn: 166739
---
 llvm/lib/Analysis/ValueTracking.cpp                |  5 +--
 .../InstCombine/2012-10-25-vector-of-pointers.ll   | 51 ----------------------
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 llvm/test/Transforms/InstCombine/2012-10-25-vector-of-pointers.ll

diff --git a/llvm/lib/Analysis/ValueTracking.cpp b/llvm/lib/Analysis/ValueTracking.cpp
index 6e4457e..1d7f069 100644
--- a/llvm/lib/Analysis/ValueTracking.cpp
+++ b/llvm/lib/Analysis/ValueTracking.cpp
@@ -437,9 +437,8 @@ void llvm::ComputeMaskedBits(Value *V, APInt &KnownZero, APInt &KnownOne,
     if (SrcTy->isPointerTy())
       SrcBitWidth = TD->getTypeSizeInBits(SrcTy);
     else
-      SrcBitWidth = TD->getTypeSizeInBits(SrcTy->getScalarType());
-
-    assert(SrcBitWidth && "SrcBitWidth can't be zero");
+      SrcBitWidth = SrcTy->getScalarSizeInBits();
+    
     KnownZero = KnownZero.zextOrTrunc(SrcBitWidth);
     KnownOne = KnownOne.zextOrTrunc(SrcBitWidth);
     ComputeMaskedBits(I->getOperand(0), KnownZero, KnownOne, TD, Depth+1);
diff --git a/llvm/test/Transforms/InstCombine/2012-10-25-vector-of-pointers.ll b/llvm/test/Transforms/InstCombine/2012-10-25-vector-of-pointers.ll
deleted file mode 100644
index 20ea282..0000000
--- a/llvm/test/Transforms/InstCombine/2012-10-25-vector-of-pointers.ll
+++ /dev/null
@@ -1,51 +0,0 @@
-; RUN: opt < %s -instcombine -S
-
-; Make sure that we don't crash when optimizing the vectors of pointers.
-
-target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.8.0"
-
-%struct.hoge = type { double*, double*, double*, double** }
-
-define void @widget(%struct.hoge* nocapture %arg) nounwind uwtable ssp {
-bb:
-  %tmp = getelementptr inbounds %struct.hoge* %arg, i64 0, i32 0
-  br i1 undef, label %bb1, label %bb17
-
-bb1:                                              ; preds = %bb
-  br i1 undef, label %bb2, label %bb3
-
-bb2:                                              ; preds = %bb1
-  br label %bb17
-
-bb3:                                              ; preds = %bb1
-  %tmp4 = bitcast double** %tmp to <2 x double*>*
-  %tmp5 = load <2 x double*>* %tmp4, align 8
-  %tmp6 = ptrtoint <2 x double*> %tmp5 to <2 x i64>
-  %tmp7 = sub <2 x i64> zeroinitializer, %tmp6
-  %tmp8 = ashr exact <2 x i64> %tmp7, <i64 3, i64 3>
-  %tmp9 = extractelement <2 x i64> %tmp8, i32 0
-  %tmp10 = add nsw i64 undef, %tmp9
-  br i1 undef, label %bb11, label %bb12
-
-bb11:                                             ; preds = %bb3
-  br label %bb13
-
-bb12:                                             ; preds = %bb3
-  br label %bb13
-
-bb13:                                             ; preds = %bb12, %bb11
-  br i1 undef, label %bb16, label %bb14
-
-bb14:                                             ; preds = %bb13
-  br i1 undef, label %bb16, label %bb15
-
-bb15:                                             ; preds = %bb14
-  br label %bb16
-
-bb16:                                             ; preds = %bb15, %bb14, %bb13
-  unreachable
-
-bb17:                                             ; preds = %bb2, %bb
-  ret void
-}
-- 
2.7.4