Merge from 'main' to 'sycl-web' (2 commits)

  CONFLICT (content): Merge conflict in llvm/lib/AsmParser/LLLexer.cpp
  CONFLICT (content): Merge conflict in llvm/lib/Bitcode/Reader/BitcodeReader.cpp

Author: wwXing0

llvm/lib/AsmParser/LLLexer.cpp

@@ -826,6 +826,9 @@ lltok::Kind LLLexer::LexIdentifier() {
   TYPEKEYWORD("x86_amx",   Type::getX86_AMXTy(Context));
   TYPEKEYWORD("token",     Type::getTokenTy(Context));
 
+#ifdef INTEL_SYCL_OPAQUEPOINTER_READY
+  TYPEKEYWORD("ptr",       PointerType::getUnqual(Context));
+#else // INTEL_SYCL_OPAQUEPOINTER_READY
   if (Keyword == "ptr") {
     // setOpaquePointers() must be called before creating any pointer types.
     if (!Context.hasSetOpaquePointersValue()) {
@@ -837,6 +840,7 @@ lltok::Kind LLLexer::LexIdentifier() {
     TyVal = PointerType::getUnqual(Context);
     return lltok::Type;
   }
+#endif // INTEL_SYCL_OPAQUEPOINTER_READY
 
 #undef TYPEKEYWORD
 

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

@@ -2385,11 +2385,13 @@ Error BitcodeReader::parseTypeTableBody() {
     case bitc::TYPE_CODE_OPAQUE_POINTER: { // OPAQUE_POINTER: [addrspace]
       if (Record.size() != 1)
         return error("Invalid opaque pointer record");
+#ifndef INTEL_SYCL_OPAQUEPOINTER_READY
       if (LLVM_UNLIKELY(!Context.hasSetOpaquePointersValue())) {
         Context.setOpaquePointers(true);
       } else if (Context.supportsTypedPointers())
         return error(
             "Opaque pointers are only supported in -opaque-pointers mode");
+#endif // INTEL_SYCL_OPAQUEPOINTER_READY
       unsigned AddressSpace = Record[0];
       ResultTy = PointerType::get(Context, AddressSpace);
       break;

llvm/lib/Transforms/Utils/ModuleUtils.cpp

@@ -393,10 +393,15 @@ bool llvm::lowerGlobalIFuncUsersAsGlobalCtor(
   LLVMContext &Ctx = M.getContext();
   const DataLayout &DL = M.getDataLayout();
 
+#ifdef INTEL_SYCL_OPAQUEPOINTER_READY
   PointerType *TableEntryTy =
-      Ctx.supportsTypedPointers()
-          ? PointerType::get(Type::getInt8Ty(Ctx), DL.getProgramAddressSpace())
-          : PointerType::get(Ctx, DL.getProgramAddressSpace());
+      PointerType::get(Ctx, DL.getProgramAddressSpace());
+#else // INTEL_SYCL_OPAQUEPOINTER_READY
+  PointerType *TableEntryTy =
+    Ctx.supportsTypedPointers()
+        ? PointerType::get(Type::getInt8Ty(Ctx), DL.getProgramAddressSpace())
+        : PointerType::get(Ctx, DL.getProgramAddressSpace());
+#endif // INTEL_SYCL_OPAQUEPOINTER_READY
 
   ArrayType *FuncPtrTableTy =
       ArrayType::get(TableEntryTy, IFuncsToLower.size());
@@ -466,9 +471,13 @@ bool llvm::lowerGlobalIFuncUsersAsGlobalCtor(
 
   InitBuilder.CreateRetVoid();
 
+#ifdef INTEL_SYCL_OPAQUEPOINTER_READY
+  PointerType *ConstantDataTy = PointerType::get(Ctx, 0);
+#else // INTEL_SYCL_OPAQUEPOINTER_READY
   PointerType *ConstantDataTy = Ctx.supportsTypedPointers()
                                     ? PointerType::get(Type::getInt8Ty(Ctx), 0)
                                     : PointerType::get(Ctx, 0);
+#endif // INTEL_SYCL_OPAQUEPOINTER_READY
 
   // TODO: Is this the right priority? Probably should be before any other
   // constructors?

llvm/tools/llvm-nm/llvm-nm.cpp

@@ -2267,11 +2267,7 @@ static std::vector<NMSymbol> dumpSymbolNamesFromFile(StringRef Filename) {
   if (error(BufferOrErr.getError(), Filename))
     return SymbolList;
 
-  // Always enable opaque pointers, to handle archives with mixed typed and
-  // opaque pointer bitcode files gracefully. As we're only reading symbols,
-  // the used pointer types don't matter.
   LLVMContext Context;
-  Context.setOpaquePointers(true);
   LLVMContext *ContextPtr = NoLLVMBitcode ? nullptr : &Context;
   Expected<std::unique_ptr<Binary>> BinaryOrErr =
       createBinary(BufferOrErr.get()->getMemBufferRef(), ContextPtr);

llvm/unittests/Analysis/BasicAliasAnalysisTest.cpp

@@ -66,9 +66,7 @@ class BasicAATest : public testing::Test {
 
 public:
   BasicAATest()
-      : M("BasicAATest", C), B(C), DL(DLString), TLI(TLII), F(nullptr) {
-    C.setOpaquePointers(true);
-  }
+      : M("BasicAATest", C), B(C), DL(DLString), TLI(TLII), F(nullptr) {}
 };
 
 // Check that a function arg can't trivially alias a global when we're accessing

llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp

@@ -162,7 +162,6 @@ static omp::ScheduleKind getSchedKind(omp::OMPScheduleType SchedType) {
 class OpenMPIRBuilderTest : public testing::Test {
 protected:
   void SetUp() override {
-    Ctx.setOpaquePointers(true);
     M.reset(new Module("MyModule", Ctx));
     FunctionType *FTy =
         FunctionType::get(Type::getVoidTy(Ctx), {Type::getInt32Ty(Ctx)},