Merge remote-tracking branch 'origin/develop'

rv-auditor · rv-auditor · commit 804424e96fd9 · 2024-05-17T17:49:33.000Z
diff --git a/bin/llvm-kompile b/bin/llvm-kompile
@@ -40,6 +40,7 @@ Options:
   --mutable-bytes                   Use the faster, unsound (mutable) semantics for objects of sort
                                     Bytes at run time, rather than the slower, sound
                                     (immutable) that are enabled by default.
+  --hidden-visibility               Set the visibility of all global symbols in generated code to "hidden"
   -O[0123]                          Set the optimization level for code generation.
 
 Any option not listed above will be passed through to clang; use '--' to
@@ -181,6 +182,11 @@ while [[ $# -gt 0 ]]; do
       codegen_flags+=("--mutable-bytes")
       shift
       ;;
+    --hidden-visibility)
+      codegen_flags+=("--hidden-visibility")
+      kompile_clang_flags+=("--hidden-visibility")
+      shift
+      ;;
     -O*)
       codegen_flags+=("$1")
       kompile_clang_flags+=("$1")
diff --git a/bin/llvm-kompile-clang b/bin/llvm-kompile-clang
@@ -14,6 +14,7 @@ shift; shift; shift
 flags=()
 llc_flags=()
 llc_opt_flags="-O0"
+visibility_hidden=false
 link=true
 export verbose=false
 export profile=false
@@ -96,6 +97,10 @@ while [[ $# -gt 0 ]]; do
       python_output_dir="$2";
       shift; shift;
       ;;
+    --hidden-visibility)
+      visibility_hidden=true
+      shift
+      ;;
     *)
       ;;
   esac
@@ -146,6 +151,12 @@ if ! $save_temps; then
   trap 'rm -rf "$tmpdir"' INT TERM EXIT
 fi
 
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  set_visibility_hidden="$LIBDIR/libSetVisibilityHidden.dylib"
+else
+  set_visibility_hidden="$LIBDIR/libSetVisibilityHidden.so"
+fi
+
 # When building the Python AST module, there's no runtime and no main file, so
 # we skip this entire step. The library code is just C++, so we can skip
 # straight to invoking the C++ compiler.
@@ -160,6 +171,11 @@ if [ "$main" != "python_ast" ]; then
       if ! $link; then
         modasm="$output_file"
       fi
+      if $visibility_hidden; then
+        modhidden="$tmpdir/hidden.bc"
+        run @OPT@ "$modopt" -load-pass-plugin "$set_visibility_hidden" -set-visibility-hidden -o "$modhidden"
+        modopt="$modhidden"
+      fi
       run @LLC@ \
         "$modopt" -mtriple=@BACKEND_TARGET_TRIPLE@ \
         -filetype=obj "$llc_opt_flags" "${llc_flags[@]}" -o "$modasm"
@@ -168,6 +184,11 @@ if [ "$main" != "python_ast" ]; then
     if $link; then
       for file in "$LIBDIR"/llvm/*.ll; do
         tmp="$tmpdir/$(basename "$file").o"
+        if $visibility_hidden; then
+          tmphidden="$tmpdir/$(basename "$file").hidden.bc"
+	  run @OPT@ "$file" -load-pass-plugin "$set_visibility_hidden" -set-visibility-hidden -o "$tmphidden"
+	  file="$tmphidden"
+        fi
         run @LLC@ \
           "$file" -mtriple=@BACKEND_TARGET_TRIPLE@ \
           -filetype=obj "$llc_opt_flags" "${llc_flags[@]}" -o "$tmp"
diff --git a/include/kllvm/codegen/ApplyPasses.h b/include/kllvm/codegen/ApplyPasses.h
@@ -6,7 +6,7 @@
 
 namespace kllvm {
 
-void apply_kllvm_opt_passes(llvm::Module &);
+void apply_kllvm_opt_passes(llvm::Module &, bool hidden_visibility);
 
 void generate_object_file(llvm::Module &, llvm::raw_ostream &);
 
diff --git a/include/kllvm/codegen/SetVisibilityHidden.h b/include/kllvm/codegen/SetVisibilityHidden.h
@@ -0,0 +1,38 @@
+#ifndef SET_VISIBILITY_HIDDEN_H
+#define SET_VISIBILITY_HIDDEN_H
+
+#include "llvm/IR/Function.h"
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/Pass.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/raw_ostream.h"
+
+namespace kllvm {
+
+bool run_set_visibility_hidden(llvm::Module &m);
+
+struct legacy_set_visibility_hidden : llvm::ModulePass {
+  // NOLINTNEXTLINE(*-identifier-naming)
+  static char ID;
+  legacy_set_visibility_hidden()
+      : llvm::ModulePass(ID) { }
+  bool runOnModule(llvm::Module &m) override {
+    return run_set_visibility_hidden(m);
+  }
+};
+
+struct set_visibility_hidden : llvm::PassInfoMixin<set_visibility_hidden> {
+  static llvm::PreservedAnalyses
+  run(llvm::Module &m, llvm::ModuleAnalysisManager &) {
+    if (!run_set_visibility_hidden(m)) {
+      return llvm::PreservedAnalyses::all();
+    }
+    return llvm::PreservedAnalyses::none();
+  }
+};
+
+} // namespace kllvm
+
+#endif
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(ast)
 add_subdirectory(binary)
 add_subdirectory(codegen)
 add_subdirectory(printer)
+add_subdirectory(set-visibility-hidden)
 
 separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
 add_definitions(${LLVM_DEFINITIONS_LIST})
diff --git a/lib/codegen/ApplyPasses.cpp b/lib/codegen/ApplyPasses.cpp
@@ -1,5 +1,6 @@
 #include <kllvm/codegen/ApplyPasses.h>
 #include <kllvm/codegen/Options.h>
+#include <kllvm/codegen/SetVisibilityHidden.h>
 
 #include "runtime/header.h"
 
@@ -35,11 +36,14 @@ CodeGenOpt::Level get_opt_level() {
   }
 }
 
-void apply_kllvm_opt_passes(llvm::Module &mod) {
+void apply_kllvm_opt_passes(llvm::Module &mod, bool hidden_visibility) {
   auto pm = legacy::PassManager();
 
   pm.add(createPromoteMemoryToRegisterPass());
   pm.add(createTailCallEliminationPass());
+  if (hidden_visibility) {
+    pm.add(new legacy_set_visibility_hidden());
+  }
 
   pm.run(mod);
 }
diff --git a/lib/set-visibility-hidden/CMakeLists.txt b/lib/set-visibility-hidden/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_library(SetVisibilityHiddenInternal
+  SetVisibilityHidden.cpp
+)
+
+add_library(SetVisibilityHidden MODULE
+  SetVisibilityHidden.cpp
+)
+
+install(
+  TARGETS SetVisibilityHiddenInternal SetVisibilityHidden
+  LIBRARY DESTINATION lib/kllvm
+)
+
+llvm_config(SetVisibilityHidden
+  USE_SHARED true
+  core irreader passes
+)
diff --git a/lib/set-visibility-hidden/SetVisibilityHidden.cpp b/lib/set-visibility-hidden/SetVisibilityHidden.cpp
@@ -0,0 +1,62 @@
+#include <kllvm/codegen/SetVisibilityHidden.h>
+
+using namespace llvm;
+
+namespace kllvm {
+__attribute__((visibility("default"))) bool
+run_set_visibility_hidden(Module &m) {
+  bool dirty = false;
+  for (auto &global : m.globals()) {
+    if (!global.isDeclaration()) {
+      global.setVisibility(GlobalValue::HiddenVisibility);
+      dirty = true;
+    }
+  }
+  for (auto &func : m.functions()) {
+    if (!func.isDeclaration()) {
+      func.setVisibility(GlobalValue::HiddenVisibility);
+      dirty = true;
+    }
+  }
+  return dirty;
+}
+
+} // namespace kllvm
+
+using namespace kllvm;
+
+__attribute__((visibility("default"))) char legacy_set_visibility_hidden::ID
+    = 0;
+
+static RegisterPass<legacy_set_visibility_hidden>
+    x("set-visibility-hidden", "Set visibility of all global values to hidden",
+      false /* Only looks at CFG */, false /* Analysis Pass */);
+
+/* New PM Registration */
+llvm::PassPluginLibraryInfo get_set_visibility_hidden_plugin_info() {
+  return {
+      LLVM_PLUGIN_API_VERSION, "SetVisibilityHidden", LLVM_VERSION_STRING,
+      [](PassBuilder &pb) {
+        pb.registerPipelineStartEPCallback(
+            [](llvm::ModulePassManager &pm, OptimizationLevel level) {
+              pm.addPass(set_visibility_hidden());
+            });
+        pb.registerPipelineParsingCallback(
+            [](StringRef name, llvm::ModulePassManager &pm,
+               ArrayRef<llvm::PassBuilder::PipelineElement>) {
+              if (name == "set-visibility-hidden") {
+                pm.addPass(set_visibility_hidden());
+                return true;
+              }
+              return false;
+            });
+      }};
+}
+
+#ifndef LLVM_BYE_LINK_INTO_TOOLS
+extern "C" __attribute__((visibility("default")))
+LLVM_ATTRIBUTE_WEAK ::llvm::PassPluginLibraryInfo
+llvmGetPassPluginInfo() {
+  return get_set_visibility_hidden_plugin_info();
+}
+#endif
diff --git a/tools/llvm-kompile-codegen/CMakeLists.txt b/tools/llvm-kompile-codegen/CMakeLists.txt
@@ -2,7 +2,7 @@ kllvm_add_tool(llvm-kompile-codegen
   main.cpp
 )
 
-target_link_libraries(llvm-kompile-codegen PUBLIC Codegen Parser AST gmp mpfr yaml)
+target_link_libraries(llvm-kompile-codegen PUBLIC Codegen Parser AST SetVisibilityHiddenInternal gmp mpfr yaml)
 
 install(
   TARGETS llvm-kompile-codegen
diff --git a/tools/llvm-kompile-codegen/main.cpp b/tools/llvm-kompile-codegen/main.cpp
@@ -66,6 +66,11 @@ cl::opt<bool> mutable_bytes(
     cl::desc("Enable unsound reference semantics for objects of sort Bytes"),
     cl::init(false), cl::cat(codegen_tool_cat));
 
+cl::opt<bool> hidden_visibility(
+    "hidden-visibility",
+    cl::desc("Set visibility of all global symbols to hidden"), cl::init(false),
+    cl::cat(codegen_tool_cat));
+
 cl::opt<bool> safe_partial(
     "safe-partial",
     cl::desc("Do not terminate the process when a partial function is "
@@ -225,7 +230,7 @@ int main(int argc, char **argv) {
   }
 
   if (!no_optimize) {
-    apply_kllvm_opt_passes(*mod);
+    apply_kllvm_opt_passes(*mod, hidden_visibility);
   }
 
   perform_output([&](auto &os) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#include <kllvm/codegen/ApplyPasses.h>`
`2`	`2`	`#include <kllvm/codegen/Options.h>`
	`3`	`+#include <kllvm/codegen/SetVisibilityHidden.h>`
`3`	`4`
`4`	`5`	`#include "runtime/header.h"`
`5`	`6`
`@@ -35,11 +36,14 @@ CodeGenOpt::Level get_opt_level() {`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`
`38`		`-void apply_kllvm_opt_passes(llvm::Module &mod) {`
	`39`	`+void apply_kllvm_opt_passes(llvm::Module &mod, bool hidden_visibility) {`
`39`	`40`	`auto pm = legacy::PassManager();`
`40`	`41`
`41`	`42`	`pm.add(createPromoteMemoryToRegisterPass());`
`42`	`43`	`pm.add(createTailCallEliminationPass());`
	`44`	`+ if (hidden_visibility) {`
	`45`	`+ pm.add(new legacy_set_visibility_hidden());`
	`46`	`+ }`
`43`	`47`
`44`	`48`	`pm.run(mod);`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ kllvm_add_tool(llvm-kompile-codegen`
`2`	`2`	`main.cpp`
`3`	`3`	`)`
`4`	`4`
`5`		`-target_link_libraries(llvm-kompile-codegen PUBLIC Codegen Parser AST gmp mpfr yaml)`
	`5`	`+target_link_libraries(llvm-kompile-codegen PUBLIC Codegen Parser AST SetVisibilityHiddenInternal gmp mpfr yaml)`
`6`	`6`
`7`	`7`	`install(`
`8`	`8`	`TARGETS llvm-kompile-codegen`