(1) Fix for test using new offloading path. Patch by Toguchi, Michael D. (2) Added -opaque-pointers option to LTO LIT tests

Author: preethi-intel

clang/lib/Driver/Driver.cpp

@@ -6781,14 +6781,16 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
                                         /*BoundArch=*/nullptr);
   }
 
-  OffloadBuilder->appendTopLevelLinkAction(Actions);
+  if (!UseNewOffloadingDriver) {
+    OffloadBuilder->appendTopLevelLinkAction(Actions);
 
-  // With static fat archives we need to create additional steps for
-  // generating dependence objects for device link actions.
-  if (!LinkerInputs.empty() && C.getDriver().getOffloadStaticLibSeen())
-    OffloadBuilder->addDeviceLinkDependenciesFromHost(LinkerInputs);
+    // With static fat archives we need to create additional steps for
+    // generating dependence objects for device link actions.
+    if (!LinkerInputs.empty() && C.getDriver().getOffloadStaticLibSeen())
+      OffloadBuilder->addDeviceLinkDependenciesFromHost(LinkerInputs);
 
-  OffloadBuilder->unbundleStaticArchives(C, Args, PL);
+    OffloadBuilder->unbundleStaticArchives(C, Args, PL);
+  }
 
   // For an FPGA archive, we add the unbundling step above to take care of
   // the device side, but also unbundle here to extract the host side

llvm/test/Instrumentation/MemorySanitizer/count-zeroes.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; INTEL RUN: opt %s -opaque-pointers -S -passes=msan 2>&1 | FileCheck %s
+; RUN: opt %s -opaque-pointers -S -passes=msan 2>&1 | FileCheck %s
 
 target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

llvm/test/LTO/X86/hidden-escaped-symbols-alt.ll

@@ -3,7 +3,7 @@
 ; RUN: split-file %s %t
 ; RUN: opt %t/hide-me.ll -o %t/hide-me.bc
 ; RUN: opt %t/ref.ll -o %t/ref.bc
-; INTEL RUN: llvm-lto2 run -opaque-pointers \
+; RUN: llvm-lto2 run -opaque-pointers \
 ; RUN:               -r %t/hide-me.bc,_hide_me,p \
 ; RUN:               -r %t/ref.bc,_main,plx  \
 ; RUN:               -r %t/ref.bc,_hide_me,l \

llvm/test/LTO/X86/hidden-escaped-symbols.ll

@@ -3,7 +3,7 @@
 ; RUN: split-file %s %t
 ; RUN: opt %t/hide-me.ll -o %t/hide-me.bc
 ; RUN: opt %t/ref.ll -o %t/ref.bc
-; INTEL RUN: llvm-lto2 run -opaque-pointers \
+; RUN: llvm-lto2 run -opaque-pointers \
 ; RUN:               -r %t/hide-me.bc,_hide_me,p \
 ; RUN:               -r %t/ref.bc,_main,plx  \
 ; RUN:               -r %t/ref.bc,_hide_me,l \

llvm/test/ThinLTO/X86/hidden-escaped-symbols-alt.ll

@@ -3,7 +3,7 @@
 ; RUN: split-file %s %t
 ; RUN: opt -module-summary %t/hide-me.ll -o %t/hide-me.bc
 ; RUN: opt -module-summary %t/ref.ll -o %t/ref.bc
-; INTEL RUN: llvm-lto2 run -opaque-pointers \
+; RUN: llvm-lto2 run -opaque-pointers \
 ; RUN:               -r %t/hide-me.bc,_hide_me,p \
 ; RUN:               -r %t/ref.bc,_main,plx  \
 ; RUN:               -r %t/ref.bc,_hide_me,l \

llvm/test/ThinLTO/X86/hidden-escaped-symbols.ll

@@ -3,7 +3,7 @@
 ; RUN: split-file %s %t
 ; RUN: opt -module-summary %t/hide-me.ll -o %t/hide-me.bc
 ; RUN: opt -module-summary %t/ref.ll -o %t/ref.bc
-; INTEL RUN: llvm-lto2 run -opaque-pointers \
+; RUN: llvm-lto2 run -opaque-pointers \
 ; RUN:               -r %t/hide-me.bc,_hide_me,p \
 ; RUN:               -r %t/ref.bc,_main,plx  \
 ; RUN:               -r %t/ref.bc,_hide_me,l \