* src/vm/jit/cfg.c: Changed all occurences of class to clazz.

* src/vm/jit/optimizing/ssa3.c: Removed accidentally forgotten diff marker resulting from previous merge.

diff --git a/src/vm/jit/cfg.c b/src/vm/jit/cfg.c
index 3f5e4fa47143bb7782db63e51bfdee7207e1e867..ab74f93191916df27626a28c60fec8cb74cd87c4 100644 (file)
--- a/src/vm/jit/cfg.c
+++ b/src/vm/jit/cfg.c
@@ -603,15 +603,21 @@ void cfg_add_exceptional_edges(jitdata *jd) {
                     +---------------------------------------------------------------+
                */
 
+               /*
                fprintf(stderr, "Found unreachable exh, adjusting %s %s", 
-                       jd->m->class->name->text, jd->m->name->text);
+                       jd->m->klazz->name->text, jd->m->name->text);
                fprintf(stderr, "<before>\n");
                show_method(jd, 3);
                fprintf(stderr, "</before>\n");
+               */
+
                cfg_eliminate_edges_to_unreachable(jd);
+
+               /*
                fprintf(stderr, "<after>\n");
                show_method(jd, 3);
                fprintf(stderr, "</after>\n");
+               */
        }
 }
 

diff --git a/src/vm/jit/optimizing/ssa3.c b/src/vm/jit/optimizing/ssa3.c
index f8050270d2befe1f316a193a437a9c3689e5446e..fb48421e21335dcce7765f9380b2df740c99f38d 100644 (file)
--- a/src/vm/jit/optimizing/ssa3.c
+++ b/src/vm/jit/optimizing/ssa3.c
@@ -44,7 +44,6 @@
 #include "mm/dumpmemory.h"
 #include "toolbox/list.h"
 
-<<<<<<< /data3/hg/src/vm/jit/optimizing/ssa3.c.orig.39076766
 #include <limits.h>
 #include <stdio.h>
 
@@ -797,7 +796,6 @@ static inline basicblock_info_t *basicblock_info(basicblock *bb) {
 
 static unsigned basicblock_get_predecessor_count(basicblock *bb) {
        unsigned ret;
-       basicblock_info_t *bbi = bb_info(bb);
        basicblock **itpred;
 
        ret = bb->predecessorcount;
@@ -1570,7 +1568,7 @@ static void ssa_enter_create_phi_graph(ssa_info *ssa) {
        char path[PATH_MAX], *ppath;
        FILE *f;
 
-       snprintf(path, PATH_MAX, "|tmp|graphs|%s.%s.dot", ssa->jd->m->class->name->text, ssa->jd->m->name->text);
+       snprintf(path, PATH_MAX, "|tmp|graphs|%s.%s.dot", ssa->jd->m->clazz->name->text, ssa->jd->m->name->text);
        for (ppath = path; *ppath; ++ppath) {
                if (*ppath == '|') *ppath = '/';
                else if (*ppath == '/') *ppath = '.';