aboutsummaryrefslogtreecommitdiff
path: root/gcc/java/verify.c
diff options
context:
space:
mode:
authorZack Weinberg <zack@gcc.gnu.org>2002-06-04 20:32:08 +0000
committerZack Weinberg <zack@gcc.gnu.org>2002-06-04 20:32:08 +0000
commitc02ebb18348ef5ef1f334bfc9ece21e390f658a0 (patch)
treea6275d033b57d7601b83e9717938acf4b721796c /gcc/java/verify.c
parentd6ee617dd7edc5cb721ad5cd320c47acd18e7ea8 (diff)
downloadgcc-c02ebb18348ef5ef1f334bfc9ece21e390f658a0.zip
gcc-c02ebb18348ef5ef1f334bfc9ece21e390f658a0.tar.gz
gcc-c02ebb18348ef5ef1f334bfc9ece21e390f658a0.tar.bz2
java-tree.h, [...]: Remove all #if JAVA_USE_HANDLES blocks...
* java-tree.h, class.c, expr.c, jcf-parse.c, parse.y, typeck.c, verify.c: Remove all #if JAVA_USE_HANDLES blocks, all mention of CLASS_TO_HANDLE_TYPE or HANDLE_TO_CLASS_TYPE, and all now-pointless local variables. Rename other local variables to reflect their not being handles. * java-tree.h, jcf-dump.c, jcf-io.c: Remove all #if JCF_USE_STDIO blocks. * parse.y: Add missing semicolon at end of rule. From-SVN: r54261
Diffstat (limited to 'gcc/java/verify.c')
-rw-r--r--gcc/java/verify.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index f554248..b81927e 100644
--- a/gcc/java/verify.c
+++ b/gcc/java/verify.c
@@ -145,8 +145,8 @@ merge_types (type1, type2)
if (type2 == ptr_type_node || type1 == object_ptr_type_node)
return type1;
- tt1 = HANDLE_TO_CLASS_TYPE (TREE_TYPE (type1));
- tt2 = HANDLE_TO_CLASS_TYPE (TREE_TYPE (type2));
+ tt1 = TREE_TYPE (type1);
+ tt2 = TREE_TYPE (type2);
/* If tt{1,2} haven't been properly loaded, now is a good time
to do it. */