Guard e65cabb

Author: jsji

llvm/lib/Analysis/ConstantFolding.cpp

@@ -988,8 +988,23 @@ Constant *SymbolicallyEvaluateGEP(const GEPOperator *GEP,
     }
 
   // Create a GEP.
+#ifdef INTEL_SYCL_OPAQUEPOINTER_READY
   return ConstantExpr::getGetElementPtr(SrcElemTy, Ptr, NewIdxs, InBounds,
                                         InRangeIndex);
+#else  // INTEL_SYCL_OPAQUEPOINTER_READY
+  Constant *C = ConstantExpr::getGetElementPtr(SrcElemTy, Ptr, NewIdxs,
+                                               InBounds, InRangeIndex);
+  assert(
+      cast<PointerType>(C->getType())->isOpaqueOrPointeeTypeMatches(ElemTy) &&
+      "Computed GetElementPtr has unexpected type!");
+
+  // If we ended up indexing a member with a type that doesn't match
+  // the type of what the original indices indexed, add a cast.
+  if (C->getType() != ResTy)
+    C = FoldBitCast(C, ResTy, DL);
+
+  return C;
+#endif // INTEL_SYCL_OPAQUEPOINTER_READY
 }
 
 /// Attempt to constant fold an instruction with the