Automerge: [clang][bytecode] Fix diagnostic difference with opaque call cmps (#129702)

Try to dig out the call expression and diagnose this as an opaque call.

Author: tbaederr

clang/CMakeLists.txt

@@ -334,12 +334,6 @@ set(CLANG_VERSION "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}.${CLANG_VERSION
 set(MAX_CLANG_ABI_COMPAT_VERSION "${LLVM_VERSION_MAJOR}")
 message(STATUS "Clang version: ${CLANG_VERSION}")
 
-# Downstream change issue: #124 (Arm Toolchain ID)
-if(NOT DEFINED ARM_TOOLCHAIN_ID)
-  set(ARM_TOOLCHAIN_ID "unset")
-endif()
-# End downstream change: #124
-
 # Configure the Version.inc file.
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/include/clang/Basic/Version.inc.in

clang/include/clang/Basic/Version.inc.in

@@ -5,5 +5,3 @@
 #define CLANG_VERSION_MINOR @CLANG_VERSION_MINOR@
 #define CLANG_VERSION_PATCHLEVEL @CLANG_VERSION_PATCHLEVEL@
 #define MAX_CLANG_ABI_COMPAT_VERSION @MAX_CLANG_ABI_COMPAT_VERSION@
-// Downstream change issue: #124 (Arm Toolchain ID)
-#define ARM_TOOLCHAIN_ID "@ARM_TOOLCHAIN_ID@"

clang/lib/Driver/Driver.cpp

@@ -2325,9 +2325,6 @@ void Driver::PrintVersion(const Compilation &C, raw_ostream &OS) const {
   // If configuration files were used, print their paths.
   for (auto ConfigFile : ConfigFiles)
     OS << "Configuration file: " << ConfigFile << '\n';
-
-  // Downstream change issue: #124 (Arm Toolchain ID)
-  OS << "Arm Toolchain ID: " << ARM_TOOLCHAIN_ID << '\n';
 }
 
 /// PrintDiagnosticCategories - Implement the --print-diagnostic-categories

clang/tools/clang-format/ClangFormat.cpp

@@ -554,8 +554,6 @@ static bool format(StringRef FileName, bool ErrorOnIncompleteFormat = false) {
 
 static void PrintVersion(raw_ostream &OS) {
   OS << clang::getClangToolFullVersion("clang-format") << '\n';
-  // Downstream change issue: #124 (Arm Toolchain ID)
-  OS << "Arm Toolchain ID: " << ARM_TOOLCHAIN_ID << '\n';
 }
 
 // Dump the configuration.

llvm/CMakeLists.txt

@@ -1164,12 +1164,6 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
 
 endif()
 
-# Downstream change issue: #124 (Arm Toolchain ID)
-if(NOT DEFINED ARM_TOOLCHAIN_ID)
-  set(ARM_TOOLCHAIN_ID "unset")
-endif()
-# End downstream change: #124
-
 # Configure the three LLVM configuration header files.
 configure_file(
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/config.h.cmake

llvm/include/llvm/Config/config.h.cmake

@@ -297,7 +297,4 @@
 
 #cmakedefine HAVE_GETAUXVAL ${HAVE_GETAUXVAL}
 
-/* Downstream change issue: #124 (Arm Toolchain ID) */
-#cmakedefine ARM_TOOLCHAIN_ID "${ARM_TOOLCHAIN_ID}"
-
 #endif

llvm/lib/Support/CommandLine.cpp

@@ -2540,8 +2540,6 @@ class VersionPrinter {
     OS << " with assertions";
 #endif
     OS << ".\n";
-    // Downstream change issue: #124 (Arm Toolchain ID)
-    OS << "Arm Toolchain ID: " << ARM_TOOLCHAIN_ID << '\n';
 
     // Iterate over any registered extra printers and call them to add further
     // information.