Rename three cxx files in unittests to cpp.

[thakis]

Summary

LLVM uses cpp as its C++ file extension, these are the only three cxx file in the monorepo. These files apparently were called to escape a CMake check -- use the LLVM_OPTIONAL_SOURCES mechanism that's meant as an escape for this case instead.

No intended behavior change.

[philip.pfaffe]

Something is off with the diff. E.g. the file TestPlugin.cpp doesn't exist, yet the diff contains modifications. Did you miss a local commit?

unittests/Passes/CMakeLists.txt

1

It's not a hack, but the purpose of that setting. So just document the intent directly.

[thakis]

update

[thakis]

In D46843#1098959, @philip.pfaffe wrote:

Something is off with the diff. E.g. the file TestPlugin.cpp doesn't exist, yet the diff contains modifications. Did you miss a local commit?

That's how svn diff looks after svn mv. Maybe you use git (which doesn't have a native "move file" operation) and aren't used to seeing this type of diff?

unittests/Passes/CMakeLists.txt

1

Fair enough. This wording is used in a few places (http://llvm-cs.pcc.me.uk/?q=Hack+to+bypass+LLVM); will change those too once this lands.

[philip.pfaffe]

In D46843#1099354, @thakis wrote:

That's how svn diff looks after svn mv. Maybe you use git (which doesn't have a native "move file" operation) and aren't used to seeing this type of diff?

I'm not sure what caused it, but the patch is not applicable.

[philip.pfaffe]

After some digging, I believe this is caused by svn diff comparing the new file against the old one, which is of course unsuitable to create patches from. So you likely should create the diff with svn diff --show-copies-as-adds or svn diff --patch-compatible.

[thakis]

In D46843#1099361, @philip.pfaffe wrote:

In D46843#1099354, @thakis wrote:

That's how svn diff looks after svn mv. Maybe you use git (which doesn't have a native "move file" operation) and aren't used to seeing this type of diff?

I'm not sure what caused it, but the patch is not applicable.

I used the command that https://llvm.org/docs/Phabricator.html#requesting-a-review-via-the-web-interface tells me to use. As far as I know, svn diff doesn't produce diffs that apply for svn mv changes. It'll commit ok.

[philip.pfaffe]

Since the diff being broken is mostly a workflow issue, this patch LGTM.

[thakis]

r332368, thanks!

unittests/Passes/CMakeLists.txt

+# Hack to bypass LLVM's CMake source checks so we can have both a library and
+# an executable built from this directory.
+set(LLVM_OPTIONAL_SOURCES TestPlugin.cpp)
+
 set(LLVM_LINK_COMPONENTS Support Passes Core)
 
 # If plugins are disabled, this test will disable itself at runtime. Otherwise,
 # reconfiguring with plugins disabled will leave behind a stale executable.
 if (LLVM_ENABLE_PLUGINS)
   add_definitions(-DLLVM_ENABLE_PLUGINS)
 endif()
 
 add_llvm_unittest(PluginsTests PluginsTest.cpp)
 export_executable_symbols(PluginsTests)
 
-add_library(TestPlugin MODULE TestPlugin.cxx)
+add_library(TestPlugin MODULE TestPlugin.cpp)
 
 set_output_directory(TestPlugin
   BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
   LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
   )
 
 set_target_properties(TestPlugin
   PROPERTIES PREFIX ""

unittests/Passes/TestPlugin.cpp

-//===- unittests/Passes/Plugins/Plugin.cxx --------------------------------===//
+//===- unittests/Passes/Plugins/Plugin.cpp --------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 

unittests/Passes/TestPlugin.cxx

-//===- unittests/Passes/Plugins/Plugin.cxx --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/Passes/PassPlugin.h"
-
-#include "TestPlugin.h"
-
-using namespace llvm;
-
-struct TestModulePass : public PassInfoMixin<TestModulePass> {
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM) {
-    return PreservedAnalyses::all();
-  }
-};
-
-void registerCallbacks(PassBuilder &PB) {
-  PB.registerPipelineParsingCallback(
-      [](StringRef Name, ModulePassManager &PM,
-         ArrayRef<PassBuilder::PipelineElement> InnerPipeline) {
-        if (Name == "plugin-pass") {
-          PM.addPass(TestModulePass());
-          return true;
-        }
-        return false;
-      });
-}
-
-extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK LLVM_PLUGIN_EXPORT
-llvmGetPassPluginInfo() {
-  return {LLVM_PLUGIN_API_VERSION, TEST_PLUGIN_NAME, TEST_PLUGIN_VERSION,
-          registerCallbacks};
-}

unittests/Support/DynamicLibrary/CMakeLists.txt

+# Hack to bypass LLVM's CMake source checks so we can have both a library and
+# an executable built from this directory.
+set(LLVM_OPTIONAL_SOURCES ExportedFuncs.cpp PipSqueak.cpp)
+
 set(LLVM_LINK_COMPONENTS Support)
 
-add_library(DynamicLibraryLib STATIC ExportedFuncs.cxx)
+add_library(DynamicLibraryLib STATIC ExportedFuncs.cpp)
 set_target_properties(DynamicLibraryLib PROPERTIES FOLDER "Tests")
 
 add_llvm_unittest(DynamicLibraryTests DynamicLibraryTest.cpp)
 target_link_libraries(DynamicLibraryTests PRIVATE DynamicLibraryLib)
 export_executable_symbols(DynamicLibraryTests)
 
 function(dynlib_add_module NAME)
-  add_library(${NAME} SHARED PipSqueak.cxx)
+  add_library(${NAME} SHARED PipSqueak.cpp)
   set_target_properties(${NAME} PROPERTIES FOLDER "Tests")
 
   set_output_directory(${NAME}
     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
     LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
     )
 
   set_target_properties(${NAME}

unittests/Support/DynamicLibrary/ExportedFuncs.cpp

-//===- llvm/unittest/Support/DynamicLibrary/DynamicLibraryLib.cpp ---------===//
+//===- llvm/unittest/Support/DynamicLibrary/ExportedFuncs.cpp -------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "PipSqueak.h"
 
 #ifndef PIPSQUEAK_TESTA_RETURN
 #define PIPSQUEAK_TESTA_RETURN "ProcessCall"
 #endif
 
 extern "C" PIPSQUEAK_EXPORT const char *TestA() { return PIPSQUEAK_TESTA_RETURN; }

unittests/Support/DynamicLibrary/ExportedFuncs.cxx

-//===- llvm/unittest/Support/DynamicLibrary/DynamicLibraryLib.cpp ---------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "PipSqueak.h"
-
-#ifndef PIPSQUEAK_TESTA_RETURN
-#define PIPSQUEAK_TESTA_RETURN "ProcessCall"
-#endif
-
-extern "C" PIPSQUEAK_EXPORT const char *TestA() { return PIPSQUEAK_TESTA_RETURN; }

unittests/Support/DynamicLibrary/PipSqueak.cpp

-//===- llvm/unittest/Support/DynamicLibrary/PipSqueak.cxx -----------------===//
+//===- llvm/unittest/Support/DynamicLibrary/PipSqueak.cpp -----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
extern "C" PIPSQUEAK_EXPORT void SetStrings(std::string &GStr,
   static Local Lcl(LStr);
 }
 
 extern "C" PIPSQUEAK_EXPORT void TestOrder(std::vector<std::string> &V) {
   Glb.Vec = &V;
 }
 
 #define PIPSQUEAK_TESTA_RETURN "LibCall"
-#include "ExportedFuncs.cxx"
+#include "ExportedFuncs.cpp"

unittests/Support/DynamicLibrary/PipSqueak.cxx

-//===- llvm/unittest/Support/DynamicLibrary/PipSqueak.cxx -----------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "PipSqueak.h"
-
-struct Global {
-  std::string *Str;
-  std::vector<std::string> *Vec;
-  Global() : Str(nullptr), Vec(nullptr) {}
-  ~Global() {
-    if (Str) {
-      if (Vec)
-        Vec->push_back(*Str);
-      *Str = "Global::~Global";
-    }
-  }
-};
-
-static Global Glb;
-
-struct Local {
-  std::string &Str;
-  Local(std::string &S) : Str(S) {
-    Str = "Local::Local";
-    if (Glb.Str && !Glb.Str->empty())
-      Str += std::string("(") + *Glb.Str + std::string(")");
-  }
-  ~Local() { Str = "Local::~Local"; }
-};
-
-
-extern "C" PIPSQUEAK_EXPORT void SetStrings(std::string &GStr,
-                                            std::string &LStr) {
-  Glb.Str = &GStr;
-  static Local Lcl(LStr);
-}
-
-extern "C" PIPSQUEAK_EXPORT void TestOrder(std::vector<std::string> &V) {
-  Glb.Vec = &V;
-}
-
-#define PIPSQUEAK_TESTA_RETURN "LibCall"
-#include "ExportedFuncs.cxx"