From b173fc92c0c2fef800d9913b0c793882b6b9d071 Mon Sep 17 00:00:00 2001
From: k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 18 Aug 2018 01:10:03 +0000
Subject: [PATCH] mjit_worker.c: revert r64322 and r64323

I gave up to introduce the optimization that skips pc motion by checking
C code's line number. The same code can often be shared by multiple
program counters and it's so hard to achieve the optimization in MJIT's
architecture.

Reverting to improve performance by removing -g1 and to remove so file
when it becomes not necessary.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 mjit_worker.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/mjit_worker.c b/mjit_worker.c
index cc5ec75165..d0adf5d1fc 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -133,7 +133,7 @@ struct rb_mjit_unit {
     /* This value is always set for `compact_all_jit_code`. Also used for lazy deletion. */
     char *o_file;
 #endif
-#if defined(_WIN32) || defined(USE_ELF)
+#if defined(_WIN32)
     /* DLL cannot be removed while loaded on Windows. If this is set, it'll be lazily deleted. */
     char *so_file;
 #endif
@@ -254,13 +254,7 @@ static const char *const CC_COMMON_ARGS[] = {
 #define CC_PATH CC_COMMON_ARGS[0]
 
 static const char *const CC_DEBUG_ARGS[] = {MJIT_DEBUGFLAGS NULL};
-static const char *const CC_OPTIMIZE_ARGS[] = {
-    MJIT_OPTFLAGS
-#ifdef USE_ELF /* at least -g1 is required to get line number on addr2line.c, and -g (-g2) is slow. */
-    "-g1",
-#endif
-    NULL
-};
+static const char *const CC_OPTIMIZE_ARGS[] = {MJIT_OPTFLAGS NULL};
 
 static const char *const CC_LDSHARED_ARGS[] = {MJIT_LDSHARED GCC_PIC_FLAGS NULL};
 static const char *const CC_DLDFLAGS_ARGS[] = {
@@ -396,7 +390,7 @@ clean_object_files(struct rb_mjit_unit *unit)
     }
 #endif
 
-#if defined(_WIN32) || defined(USE_ELF)
+#if defined(_WIN32)
     if (unit->so_file) {
         char *so_file = unit->so_file;
 
@@ -671,9 +665,8 @@ exec_process(const char *path, char *const argv[])
 static void
 remove_so_file(const char *so_file, struct rb_mjit_unit *unit)
 {
-#if defined(_WIN32) || defined(USE_ELF)
-    /* Windows can't remove files while it's used. With USE_ELF, we use it to get a line
-       number and symbol name on addr2line for debugging and future optimization. */
+#if defined(_WIN32)
+    /* Windows can't remove files while it's used. */
     unit->so_file = strdup(so_file); /* lazily delete on `clean_object_files()` */
     if (unit->so_file == NULL)
         mjit_warning("failed to allocate memory to lazily remove '%s': %s", so_file, strerror(errno));