personal change

Author: pcc

compiler-rt/lib/builtins/aarch64/emupac.cpp

@@ -47,7 +47,11 @@ const uint64_t kTTBR1Mask = 1ULL << 55;
 static bool pac_supported() {
   register uintptr_t x30 __asm__("x30") = 1ULL << 55;
   __asm__ __volatile__("xpaclri" : "+r"(x30));
+#ifdef FORCE_NON_PAC
+  return !(x30 & (1ULL << 54));
+#else
   return x30 & (1ULL << 54);
+#endif
 }
 
 // This asm snippet is used to force the creation of a frame record when

llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp

@@ -475,19 +475,23 @@ bool expandProtectedFieldPtr(Function &Intr) {
 
   auto CreateSign = [&](IRBuilder<> &B, Value *Val, Value *Disc,
                        OperandBundleDef DSBundle) {
+#ifndef FORCE_EMUPAC
     Function *F = B.GetInsertBlock()->getParent();
     Attribute FSAttr = F->getFnAttribute("target-features");
     if (FSAttr.isValid() && FSAttr.getValueAsString().contains("+pauth"))
       return B.CreateCall(SignIntr, {Val, B.getInt32(2), Disc}, DSBundle);
+#endif
     return B.CreateCall(EmuSignIntr, {Val, Disc}, DSBundle);
   };
 
   auto CreateAuth = [&](IRBuilder<> &B, Value *Val, Value *Disc,
                        OperandBundleDef DSBundle) {
+#ifndef FORCE_EMUPAC
     Function *F = B.GetInsertBlock()->getParent();
     Attribute FSAttr = F->getFnAttribute("target-features");
     if (FSAttr.isValid() && FSAttr.getValueAsString().contains("+pauth"))
       return B.CreateCall(AuthIntr, {Val, B.getInt32(2), Disc}, DSBundle);
+#endif
     return B.CreateCall(EmuAuthIntr, {Val, Disc}, DSBundle);
   };
 

llvm/utils/gn/build/toolchain/target_flags.gni

@@ -2,6 +2,12 @@ import("//llvm/triples.gni")
 import("//llvm/utils/gn/build/mac_sdk.gni")
 import("//llvm/utils/gn/build/toolchain/compiler.gni")
 
+declare_args() {
+  stage2_pointer_field_protection = "none"
+  emupac_force = false
+  emupac_force_non_pac = false
+}
+
 # Flags in this file are passed both to the compiler that's building
 # compiler-rt at build time (via normal gn cflags/ldflags), as well as to the
 # compiler building compiler-rt test programs at test time (via
@@ -63,3 +69,20 @@ if (current_cpu == "x86") {
     target_flags += [ "-m32" ]
   }
 }
+
+if (current_toolchain != host_toolchain && current_cpu == "arm64") {
+  target_flags += [
+    "-march=armv8.3a",
+  ]
+}
+if (current_toolchain != host_toolchain) {
+  target_flags += [
+    "-fexperimental-pointer-field-protection=$stage2_pointer_field_protection",
+  ]
+  target_ldflags += [
+    "--rtlib=compiler-rt",
+    "--unwindlib=libunwind",
+    "-static-libgcc",
+    "-L" + rebase_path(root_build_dir) + "/lib",
+  ]
+}

llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn

@@ -1,5 +1,6 @@
 import("//compiler-rt/target.gni")
 import("//llvm/utils/gn/build/buildflags.gni")
+import("//llvm/utils/gn/build/toolchain/target_flags.gni")
 
 declare_args() {
   # Skip the atomic builtin (should normally be provided by a shared library).
@@ -510,6 +511,9 @@ static_library("builtins") {
     }
   }
 
+  if (emupac_force_non_pac) {
+    defines = [ "FORCE_NON_PAC" ]
+  }
   if (current_cpu == "avr") {
     sources += [
       "avr/divmodhi4.S",

llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn

@@ -1,3 +1,5 @@
+import("//llvm/utils/gn/build/toolchain/target_flags.gni")
+
 static_library("CodeGen") {
   output_name = "LLVMCodeGen"
   public_deps = [
@@ -254,4 +256,7 @@ static_library("CodeGen") {
     "WindowScheduler.cpp",
     "XRayInstrumentation.cpp",
   ]
+  if (emupac_force) {
+    defines = [ "FORCE_EMUPAC" ]
+  }
 }

llvm/utils/pfp-bazel

@@ -0,0 +1,17 @@
+#!/bin/sh -xe
+
+shopt -s globstar
+
+tc="$(dirname $0)/../../ra"
+
+mtime_before="$(stat -c %Y $tc/bin/clang || true)"
+ninja -C $tc clang
+mtime_after="$(stat -c %Y $tc/bin/clang)"
+if [ "$mtime_before" != "$mtime_after"  ] ; then
+  rm -f $tc/stage2_*/**/*.o
+fi
+ninja -C $tc libcxx
+
+cflags=$(grep COMPILER_RT_TEST_COMPILER_CFLAGS= $tc/stage2_unix/toolchain.ninja | sed -e 's/\\\$ /:/g' | grep -o COMPILER_RT_TEST_COMPILER_CFLAGS='[^ ]*' | cut -d= -f2-)
+cflags="$cflags:-Wno-unused-command-line-argument"
+BAZEL_CXXOPTS=$cflags:-stdlib=libc++ BAZEL_LINKLIBS=$cflags:-Wl,-Bstatic:-lc++:-lc++abi:-Wl,-Bdynamic:-lm CC=clang PATH=$tc/bin:$PATH bazel "$@"

llvm/utils/pfp-check-libcxx

@@ -0,0 +1,90 @@
+#!/bin/sh -xe
+
+shopt -s globstar
+
+tc="$(cd $(dirname $0)/../../ra && pwd)"
+
+mtime_before="$(stat -c %Y $tc/bin/clang || true)"
+ninja -C $tc clang
+mtime_after="$(stat -c %Y $tc/bin/clang)"
+if [ "$mtime_before" != "$mtime_after"  ] ; then
+  rm -f $tc/stage2_*/**/*.o
+fi
+ninja -C $tc libcxx
+
+cflags=$(grep COMPILER_RT_TEST_COMPILER_CFLAGS= $tc/stage2_unix/toolchain.ninja | sed -e 's/\\\$ /:/g' | grep -o COMPILER_RT_TEST_COMPILER_CFLAGS='[^ ]*' | sed -e 's/:/ /g' | cut -d= -f2-)
+cflags="$cflags -Wno-unused-command-line-argument"
+
+mkdir -p $tc/check-libcxx
+cat > $tc/check-libcxx/lit.site.cfg <<LIT
+# This testing configuration handles running the test suite against LLVM's libc++
+# using a static library.
+
+lit_config.load_config(config, '$tc/check-libcxx/cmake-bridge.cfg')
+
+config.substitutions.append(('%{flags}',
+    '-pthread'
+))
+config.substitutions.append(('%{compile_flags}',
+    '-nostdinc++ -I %{include-dir} -I %{target-include-dir} -I %{libcxx-dir}/test/support $cflags'
+))
+config.substitutions.append(('%{link_flags}',
+    '-nostdlib++ -L %{lib-dir} -Wl,-Bstatic -lc++ -lc++abi -Wl,-Bdynamic --rtlib=compiler-rt --unwindlib=libunwind -static-libgcc -static-libstdc++ -stdlib=libc++ -fuse-ld=lld'
+))
+config.substitutions.append(('%{exec}',
+    '%{executor} --execdir %T -- '
+))
+
+import os, site
+site.addsitedir(os.path.join('@LIBCXX_SOURCE_DIR@', 'utils'))
+import libcxx.test.params, libcxx.test.config
+libcxx.test.config.configure(
+    libcxx.test.params.DEFAULT_PARAMETERS,
+    libcxx.test.features.DEFAULT_FEATURES,
+    config,
+    lit_config
+)
+LIT
+
+cat > $tc/check-libcxx/cmake-bridge.cfg <<LIT
+## Autogenerated by libcxx configuration.
+# Do not edit!
+
+# Lit parameters serialized here for llvm-lit to pick them up
+config.compiler = "$tc/bin/clang++"
+config.hardening_mode = "extensive"
+config.target_triple = "aarch64-unknown-linux-gnu"
+
+
+#
+# This file performs the bridge between the CMake configuration and the Lit
+# configuration files by setting up the LitConfig object and various Lit
+# substitutions from CMake variables.
+#
+# Individual configuration files can take advantage of this bridge by
+# loading the file and then setting up the remaining Lit substitutions.
+#
+
+import os, site
+site.addsitedir(os.path.join('$tc/../libcxx', 'utils'))
+import libcxx.test.format
+
+# Basic configuration of the test suite
+config.name = os.path.basename('$tc/../libcxx/test/configs/llvm-libc++-static.cfg.in')
+config.test_source_root = os.path.join('$tc/../libcxx', 'test')
+config.test_format = libcxx.test.format.CxxStandardLibraryTest()
+config.recursiveExpansionLimit = 10
+config.test_exec_root = '$tc/check-libcxx'
+
+# Add substitutions for bootstrapping the test suite configuration
+config.substitutions.append(('%{libcxx-dir}', '$tc/../libcxx'))
+config.substitutions.append(('%{install-prefix}', '$tc'))
+config.substitutions.append(('%{include-dir}', '$tc/include/c++/v1'))
+config.substitutions.append(('%{target-include-dir}', '$tc/include/aarch64-unknown-linux-gnu/c++/v1'))
+config.substitutions.append(('%{lib-dir}', '$tc/lib'))
+config.substitutions.append(('%{module-dir}', '$tc/share/libc++/v1'))
+config.substitutions.append(('%{test-tools-dir}', '$tc/../libcxx/test/tools'))
+config.substitutions.append(('%{benchmark_flags}', ''))
+LIT
+
+$tc/bin/llvm-lit -sv $tc/check-libcxx --param enable_benchmarks=no --filter-out /modules/

llvm/utils/pfp-cmake

@@ -0,0 +1,17 @@
+#!/bin/sh -xe
+
+shopt -s globstar
+
+tc="$(dirname $0)/../../ra"
+
+mtime_before="$(stat -c %Y $tc/bin/clang || true)"
+ninja -C $tc clang
+mtime_after="$(stat -c %Y $tc/bin/clang)"
+if [ "$mtime_before" != "$mtime_after"  ] ; then
+  rm -f $tc/stage2_*/**/*.o
+fi
+ninja -C $tc libcxx
+
+cflags=$(grep COMPILER_RT_TEST_COMPILER_CFLAGS= $tc/stage2_unix/toolchain.ninja | sed -e 's/\\\$ /:/g' | grep -o COMPILER_RT_TEST_COMPILER_CFLAGS='[^ ]*' | sed -e 's/:/ /g' | cut -d= -f2-)
+cflags="$cflags -Wno-unused-command-line-argument"
+CC=$tc/bin/clang CXX=$tc/bin/clang++ cmake -G Ninja -DCMAKE_C_FLAGS="$cflags" -DCMAKE_CXX_FLAGS="$cflags -stdlib=libc++" -DCMAKE_{EXE,SHARED,MODULE}_LINKER_FLAGS="$cflags -Wl,-Bstatic -lc++ -lc++abi -Wl,-Bdynamic -lm -fuse-ld=lld -static-libstdc++" "$@"

llvm/utils/pfp-patches/dart.patch

@@ -0,0 +1,127 @@
+From 47e6d11cc8b6db025c43451ad68afd42c2892071 Mon Sep 17 00:00:00 2001
+From: Peter Collingbourne <[email protected]>
+Date: Mon, 3 Mar 2025 20:07:20 -0800
+Subject: [PATCH] PFP fixes
+
+---
+ runtime/platform/allocation.h | 4 ++++
+ runtime/vm/dart.cc            | 5 ++---
+ runtime/vm/isolate.cc         | 5 ++++-
+ runtime/vm/isolate.h          | 4 ++--
+ runtime/vm/timeline.cc        | 4 ++++
+ 5 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/runtime/platform/allocation.h b/runtime/platform/allocation.h
+index 26001ac54f2..5bc2a10960b 100644
+--- a/runtime/platform/allocation.h
++++ b/runtime/platform/allocation.h
+@@ -40,6 +40,10 @@ class MallocAllocated {
+  public:
+   MallocAllocated() {}
+ 
++  // Placement new.
++  void* operator new(size_t size, void *p) { return p; }
++  void* operator new[](size_t size, void *p) { return p; }
++
+   // Intercept operator new to produce clearer error messages when we run out
+   // of memory. Don't do this when running under ASAN so it can continue to
+   // check malloc/new/new[] are paired with free/delete/delete[] respectively.
+diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
+index 490549316ef..d78779a511a 100644
+--- a/runtime/vm/dart.cc
++++ b/runtime/vm/dart.cc
+@@ -165,12 +165,12 @@ class DartInitializationState : public AllStatic {
+ std::atomic<uint8_t> DartInitializationState::state_ = {kUnInitialized};
+ std::atomic<uint64_t> DartInitializationState::in_use_count_ = {0};
+ 
+-#if defined(DART_PRECOMPILER) || defined(DART_PRECOMPILED_RUNTIME)
+ static void CheckOffsets() {
+ #if !defined(IS_SIMARM_HOST64)
+   // These offsets are embedded in precompiled instructions. We need the
+   // compiler and the runtime to agree.
+   bool ok = true;
++  (void)ok;
+ #define CHECK_OFFSET(expr, offset)                                             \
+   if ((expr) != (offset)) {                                                    \
+     OS::PrintErr("%s got %" Pd ", %s expected %" Pd "\n", #expr,               \
+@@ -226,7 +226,6 @@ static void CheckOffsets() {
+     }                                                                          \
+   }
+ #define CHECK_CONSTANT(Class, Name) CHECK_OFFSET(Class::Name, Class##_##Name);
+-#endif  // defined(DART_PRECOMPILED_RUNTIME)
+ 
+   COMMON_OFFSETS_LIST(CHECK_FIELD, CHECK_ARRAY, CHECK_SIZEOF,
+                       CHECK_ARRAY_SIZEOF, CHECK_PAYLOAD_SIZEOF, CHECK_RANGE,
+@@ -258,8 +257,8 @@ static void CheckOffsets() {
+ #endif  // defined(DART_PRECOMPILER) || defined(DART_PRECOMPILED_RUNTIME)
+ 
+ char* Dart::DartInit(const Dart_InitializeParams* params) {
+-#if defined(DART_PRECOMPILER) || defined(DART_PRECOMPILED_RUNTIME)
+   CheckOffsets();
++#if defined(DART_PRECOMPILER) || defined(DART_PRECOMPILED_RUNTIME)
+ #elif defined(ARCH_IS_64_BIT) != defined(TARGET_ARCH_IS_64_BIT)
+   return Utils::StrDup(
+       "JIT cannot simulate target architecture with different word size than "
+diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
+index 11cb004f448..c48623b8907 100644
+--- a/runtime/vm/isolate.cc
++++ b/runtime/vm/isolate.cc
+@@ -448,6 +448,8 @@ IsolateGroup::~IsolateGroup() {
+   delete debugger_;
+   debugger_ = nullptr;
+ #endif
++
++  delete object_store_;
+ }
+ 
+ void IsolateGroup::RegisterIsolate(Isolate* isolate) {
+@@ -1112,7 +1114,8 @@ bool Isolate::SendInternalLibMessage(Dart_Port main_port,
+ }
+ 
+ void IsolateGroup::set_object_store(ObjectStore* object_store) {
+-  object_store_.reset(object_store);
++  delete object_store_;
++  object_store_ = object_store;
+ }
+ 
+ class IsolateMessageHandler : public MessageHandler {
+diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h
+index 9f5d27fb404..5b501b3fc4f 100644
+--- a/runtime/vm/isolate.h
++++ b/runtime/vm/isolate.h
+@@ -506,7 +506,7 @@ class IsolateGroup : public IntrusiveDListEntry<IsolateGroup> {
+   void DropOriginalClassTable();
+ 
+   StoreBuffer* store_buffer() const { return store_buffer_.get(); }
+-  ObjectStore* object_store() const { return object_store_.get(); }
++  ObjectStore* object_store() const { return object_store_; }
+   Mutex* symbols_mutex() { return &symbols_mutex_; }
+   Mutex* type_canonicalization_mutex() { return &type_canonicalization_mutex_; }
+   Mutex* type_arguments_canonicalization_mutex() {
+@@ -819,7 +819,7 @@ class IsolateGroup : public IntrusiveDListEntry<IsolateGroup> {
+   // Accessed from generated code.
+   ClassTable* class_table_;
+   AcqRelAtomic<ClassPtr*> cached_class_table_table_;
+-  std::unique_ptr<ObjectStore> object_store_;
++  ObjectStore* object_store_;
+   // End accessed from generated code.
+ 
+   ClassTableAllocator class_table_allocator_;
+diff --git a/runtime/vm/timeline.cc b/runtime/vm/timeline.cc
+index 211f0e28741..ba07afac27c 100644
+--- a/runtime/vm/timeline.cc
++++ b/runtime/vm/timeline.cc
+@@ -1595,6 +1595,10 @@ TimelineEventFixedBufferRecorder::TimelineEventFixedBufferRecorder(
+   if (memory_ == nullptr) {
+     OUT_OF_MEMORY();
+   }
++  for (intptr_t i = 0; i != num_blocks_; ++i) {
++    new (reinterpret_cast<char*>(memory_->address()) +
++         i * sizeof(TimelineEventBlock)) TimelineEventBlock(i);
++  }
+   blocks_ = reinterpret_cast<TimelineEventBlock*>(memory_->address());
+ }
+ 
+-- 
+2.48.1
+