Remove patchpoint called func can@t be symbolic workaround

Author: undingen

src/asm_writing/rewriter.cpp

@@ -2064,6 +2064,27 @@ bool spillFrameArgumentIfNecessary(StackMap::Record::Location& l, uint8_t*& inst
     }
 }
 
+void* getSlowpathFunc(uint8_t* pp_addr) {
+#ifndef NDEBUG
+    // mov $imm, %r11:
+    ASSERT(pp_addr[0] == 0x49, "%x", pp_addr[0]);
+    assert(pp_addr[1] == 0xbb);
+    // 8 bytes of the addr
+
+    // callq *%r11:
+    assert(pp_addr[10] == 0x41);
+    assert(pp_addr[11] == 0xff);
+    assert(pp_addr[12] == 0xd3);
+
+    int i = INITIAL_CALL_SIZE;
+    while (*(pp_addr + i) == 0x66 || *(pp_addr + i) == 0x0f || *(pp_addr + i) == 0x2e)
+        i++;
+    assert(*(pp_addr + i) == 0x90 || *(pp_addr + i) == 0x1f);
+#endif
+
+    return *(void**)&pp_addr[2];
+}
+
 void setSlowpathFunc(uint8_t* pp_addr, void* func) {
 #ifndef NDEBUG
     // mov $imm, %r11:

src/asm_writing/rewriter.h

@@ -608,6 +608,7 @@ class Rewriter : public ICSlotRewrite::CommitHook, public gc::GCVisitable {
     friend class RewriterVar;
 };
 
+void* getSlowpathFunc(uint8_t* pp_addr);
 void setSlowpathFunc(uint8_t* pp_addr, void* func);
 
 struct GRCompare {

src/codegen/irgen/irgenerator.cpp

@@ -332,11 +332,16 @@ class IREmitterImpl : public IREmitter {
         std::vector<llvm::Value*> pp_args;
         pp_args.push_back(getConstantInt(pp_id, g.i64));
         pp_args.push_back(getConstantInt(pp_size, g.i32));
+
+#if LLVMREV < 235483
         if (ENABLE_JIT_OBJECT_CACHE)
             // add fixed dummy dest pointer, we will replace it with the correct address during stackmap processing
             pp_args.push_back(embedConstantPtr((void*)-1L, g.i8_ptr));
         else
             pp_args.push_back(func);
+#else
+        pp_args.push_back(func);
+#endif
         pp_args.push_back(getConstantInt(args.size(), g.i32));
 
         pp_args.insert(pp_args.end(), args.begin(), args.end());

src/codegen/irgen/util.cpp

@@ -229,6 +229,7 @@ class PrettifyingMaterializer : public llvm::ValueMaterializer {
                         ii->setArgOperand(i, llvm::MapValue(op, VMap, flags, type_remapper, this));
                         continue;
                     } else {
+#if LLVMREV < 235483
                         assert(pp_id != -1);
                         void* addr = PatchpointInfo::getSlowpathAddr(pp_id);
 
@@ -249,6 +250,9 @@ class PrettifyingMaterializer : public llvm::ValueMaterializer {
                         } else {
                             ii->setArgOperand(i, module->getOrInsertGlobal(name, g.i8));
                         }
+#else
+                        assert(0);
+#endif
                     }
                 }
                 return ii;

src/codegen/patchpoints.cpp

@@ -162,7 +162,6 @@ void processStackmap(CompiledFunction* cf, StackMap* stackmap) {
         PatchpointInfo* pp = new_patchpoints[r->id].first;
         assert(pp);
 
-        void* slowpath_func = PatchpointInfo::getSlowpathAddr(r->id);
         if (VERBOSITY() >= 2) {
             printf("Processing pp %ld; [%d, %d)\n", reinterpret_cast<int64_t>(pp), r->offset,
                    r->offset + pp->patchpointSize());
@@ -178,8 +177,13 @@ void processStackmap(CompiledFunction* cf, StackMap* stackmap) {
         uint8_t* start_addr = (uint8_t*)pp->parentFunction()->code + r->offset;
         uint8_t* end_addr = start_addr + pp->patchpointSize();
 
+#if LLVMREV < 235483
+        void* slowpath_func = PatchpointInfo::getSlowpathAddr(r->id);
         if (ENABLE_JIT_OBJECT_CACHE)
             setSlowpathFunc(start_addr, slowpath_func);
+#else
+        void* slowpath_func = getSlowpathFunc(start_addr);
+#endif
 
         //*start_addr = 0xcc;
         // start_addr++;