From f93cf79505f07cb97597fbc5955462ad7670ca5c Mon Sep 17 00:00:00 2001
From: Dan Gohman <gohman@apple.com>
Date: Thu, 21 Aug 2008 17:37:05 +0000
Subject: [PATCH] Have FastISel skip the multiply by 1 for getelementptr on
 i8*.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55129 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/CodeGen/SelectionDAG/FastISel.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp
index 71042ff277a..450596e50d0 100644
--- a/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -124,10 +124,8 @@ bool FastISel::SelectGetElementPtr(Instruction *I,
         // Unhandled operand. Halt "fast" selection and bail.
         return false;
 
-      // FIXME: If multiple is power of two, turn it into a shift. The
-      // optimization should be in FastEmit_ri?
-      IdxN = FastEmit_ri_(VT, ISD::MUL, IdxN,
-                          ElementSize, VT);
+      if (ElementSize != 1)
+        IdxN = FastEmit_ri_(VT, ISD::MUL, IdxN, ElementSize, VT);
       if (IdxN == 0)
         // Unhandled operand. Halt "fast" selection and bail.
         return false;