From 62ae73e384da6d7b30b13d10cb235d9e485e873f Mon Sep 17 00:00:00 2001
From: Peter Molnar <pm@complang.tuwien.ac.at>
Date: Wed, 14 May 2008 09:32:23 +0200
Subject: [PATCH] * 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.

---
 src/vm/jit/cfg.c             | 8 +++++++-
 src/vm/jit/optimizing/ssa3.c | 4 +---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vm/jit/cfg.c b/src/vm/jit/cfg.c
index 3f5e4fa47..ab74f9319 100644
--- 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 f8050270d..fb48421e2 100644
--- 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 = '.';
-- 
2.25.1