[llvm-branch-commits] [llvm-branch] r214253 - Merging r213884:

[Hans Wennborg]

Author: hans
Date: Tue Jul 29 18:40:11 2014
New Revision: 214253

URL: http://llvm.org/viewvc/llvm-project?rev=214253&view=rev
Log:
Merging r213884:
------------------------------------------------------------------------
r213884 | mren | 2014-07-24 10:57:09 -0700 (Thu, 24 Jul 2014) | 1 line

Try to fix the bots again by moving test to X86 directory.
------------------------------------------------------------------------

Added:
    llvm/branches/release_35/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll
      - copied unchanged from r213884, llvm/trunk/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll
Removed:
    llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll
Modified:
    llvm/branches/release_35/   (props changed)

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 29 18:40:11 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213749,213815,213847,213880,213894,213915
+/llvm/trunk:155241,213653,213749,213815,213847,213880,213884,213894,213915

Removed: llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll?rev=214252&view=auto
==============================================================================
--- llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll (original)
+++ llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll (removed)
@@ -1,41 +0,0 @@
-; RUN: opt -S -simplifycfg < %s -mtriple=x86_64-apple-darwin12.0.0 | FileCheck %s
-; rdar://17735071
-target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
-target triple = "x86_64-apple-darwin12.0.0"
-
-; When tableindex can't fit into i2, we should extend the type to i3.
-; CHECK-LABEL: @_TFO6reduce1E5toRawfS0_FT_Si
-; CHECK: entry:
-; CHECK-NEXT: sub i2 %0, -2
-; CHECK-NEXT: zext i2 %switch.tableidx to i3
-; CHECK-NEXT: getelementptr inbounds [4 x i64]* @switch.table, i32 0, i3 %switch.tableidx.zext
-; CHECK-NEXT: load i64* %switch.gep
-; CHECK-NEXT: ret i64 %switch.load
-define i64 @_TFO6reduce1E5toRawfS0_FT_Si(i2) {
-entry:
-  switch i2 %0, label %1 [
-    i2 0, label %2
-    i2 1, label %3
-    i2 -2, label %4
-    i2 -1, label %5
-  ]
-
-; <label>:1                                       ; preds = %entry
-  unreachable
-
-; <label>:2                                       ; preds = %2
-  br label %6
-
-; <label>:3                                       ; preds = %4
-  br label %6
-
-; <label>:4                                       ; preds = %6
-  br label %6
-
-; <label>:5                                       ; preds = %8
-  br label %6
-
-; <label>:6                                      ; preds = %3, %5, %7, %9
-  %7 = phi i64 [ 3, %5 ], [ 2, %4 ], [ 1, %3 ], [ 0, %2 ]
-  ret i64 %7
-}