Fix NVPTX logic bug

Author: rnk

llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp

@@ -59,6 +59,12 @@ static cl::opt<bool> DisableRequireStructuredCFG(
              "unexpected regressions happen."),
     cl::init(false), cl::Hidden);
 
+static cl::opt<bool> UseShortPointersOpt(
+    "nvptx-short-ptr",
+    cl::desc(
+        "Use 32-bit pointers for accessing const/local/shared address spaces."),
+    cl::init(false), cl::Hidden);
+
 // byval arguments in NVPTX are special. We're only allowed to read from them
 // using a special instruction, and if we ever need to write to them or take an
 // address, we must make a local copy and use it, instead.
@@ -112,12 +118,6 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeNVPTXTarget() {
   initializeNVPTXPrologEpilogPassPass(PR);
 }
 
-static cl::opt<bool> NVPTXUseShortPointers(
-    "nvptx-short-ptr",
-    cl::desc(
-        "Use 32-bit pointers for accessing const/local/shared address spaces."),
-    cl::init(false), cl::Hidden);
-
 NVPTXTargetMachine::NVPTXTargetMachine(const Target &T, const Triple &TT,
                                        StringRef CPU, StringRef FS,
                                        const TargetOptions &Options,
@@ -127,7 +127,7 @@ NVPTXTargetMachine::NVPTXTargetMachine(const Target &T, const Triple &TT,
     // The pic relocation model is used regardless of what the client has
     // specified, as it is the only relocation model currently supported.
     : CodeGenTargetMachineImpl(
-          T, TT.computeDataLayout(NVPTXUseShortPointers ? "" : "shortptr"), TT,
+          T, TT.computeDataLayout(UseShortPointersOpt ? "shortptr" : ""), TT,
           CPU, FS, Options, Reloc::PIC_,
           getEffectiveCodeModel(CM, CodeModel::Small), OL),
       is64bit(is64bit), TLOF(std::make_unique<NVPTXTargetObjectFile>()),