Enforce opaque IR pointers

Author: kinke

driver/cl_options.cpp

@@ -710,12 +710,6 @@ cl::opt<bool> dynamicCompileTlsWorkaround(
     cl::Hidden);
 #endif
 
-#if LDC_LLVM_VER >= 1700
-bool enableOpaqueIRPointers = true; // typed pointers are no longer supported from LLVM 17
-#else
-bool enableOpaqueIRPointers = false;
-#endif
-
 static cl::extrahelp
     footer("\n"
            "-d-debug can also be specified without options, in which case it "
@@ -775,9 +769,6 @@ void createClashingOptions() {
                      "Hardware floating-point ABI and instructions")));
 
   renameAndHide("opaque-pointers", nullptr); // remove
-  new cl::opt<bool, true>(
-      "opaque-pointers", cl::ZeroOrMore, cl::location(enableOpaqueIRPointers),
-      cl::desc("Use opaque IR pointers (experimental!)"), cl::Hidden);
 }
 
 /// Hides command line options exposed from within LLVM that are unlikely
@@ -865,7 +856,7 @@ void hideLLVMOptions() {
       "no-discriminators", "no-integrated-as", "no-type-check", "no-xray-index",
       "nozero-initialized-in-bss", "nvptx-sched4reg",
       "objc-arc-annotation-target-identifier",
-      "object-size-offset-visitor-max-visit-instructions", "opaque-pointers",
+      "object-size-offset-visitor-max-visit-instructions",
       "pgo-block-coverage", "pgo-temporal-instrumentation",
       "pgo-view-block-coverage-graph",
       "pie-copy-relocations", "poison-checking-function-local",

driver/cl_options.h

@@ -150,6 +150,4 @@ extern cl::opt<bool> dynamicCompileTlsWorkaround;
 #else
 constexpr bool enableDynamicCompile = false;
 #endif
-
-extern bool enableOpaqueIRPointers;
 }

driver/main.cpp

@@ -558,15 +558,13 @@ void parseCommandLine(Strings &sourceFiles) {
   global.params.dihdr.fullOutput = opts::hdrKeepAllBodies;
   global.params.disableRedZone = opts::disableRedZone();
 
+  // enforce opaque IR pointers
 #if LDC_LLVM_VER >= 1700
-  if (!opts::enableOpaqueIRPointers)
-    error(Loc(),
-          "LLVM version 17 or above only supports --opaque-pointers=true");
+  // supports opaque IR pointers only
 #elif LDC_LLVM_VER >= 1500
-  getGlobalContext().setOpaquePointers(opts::enableOpaqueIRPointers);
-#else
-  if (opts::enableOpaqueIRPointers)
-    getGlobalContext().enableOpaquePointers();
+  getGlobalContext().setOpaquePointers(true);
+#else // LLVM 14
+  getGlobalContext().enableOpaquePointers();
 #endif
 }
 

tests/codegen/dcompute_cl_addrspaces_new.d renamed to tests/codegen/dcompute_cl_addrspaces.d

@@ -4,9 +4,9 @@
 // UNSUPPORTED: atleast_llvm1800 && atmost_llvm1809
 
 // REQUIRES: target_SPIRV && atleast_llvm1600
-// RUN: %ldc -c -opaque-pointers -mdcompute-targets=ocl-220 -m64 -mdcompute-file-prefix=addrspace_new -output-ll -output-o %s && FileCheck %s --check-prefix=LL < addrspace_new_ocl220_64.ll \
+// RUN: %ldc -c -mdcompute-targets=ocl-220 -m64 -mdcompute-file-prefix=addrspace_new -output-ll -output-o %s && FileCheck %s --check-prefix=LL < addrspace_new_ocl220_64.ll \
 // RUN: && %llc addrspace_new_ocl220_64.ll -mtriple=spirv64-unknown-unknown -O0 -o - | FileCheck %s --check-prefix=SPT
-@compute(CompileFor.deviceOnly) module dcompute_cl_addrspaces_new;
+@compute(CompileFor.deviceOnly) module dcompute_cl_addrspaces;
 import ldc.dcompute;
 
 // LL: %"ldc.dcompute.Pointer!(AddrSpace.Private, float).Pointer" = type { ptr }