Mercurial > hg > graal-compiler
changeset 6951:e54fcd0405f6
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 14 Nov 2012 11:29:32 +0100 |
parents | 41938af2b3d8 (current diff) f1cb5a0ddb51 (diff) |
children | b03db3c97f74 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/WordTypeRewriterPhase.java src/share/vm/graal/graalCompilerToVM.cpp |
diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/WordTypeRewriterPhase.java Wed Nov 14 11:28:02 2012 +0100 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/WordTypeRewriterPhase.java Wed Nov 14 11:29:32 2012 +0100 @@ -43,6 +43,8 @@ */ public class WordTypeRewriterPhase extends Phase { + private static final String WordClassName = MetaUtil.toInternalName(Word.class.getName()); + private final Kind wordKind; private final ResolvedJavaType wordType; @@ -304,7 +306,7 @@ } public static boolean isWord(ResolvedJavaType type) { - if (type != null && type.toJava() == Word.class) { + if (type != null && type.getName().equals(WordClassName)) { return true; } return false;
--- a/hotspot/.project Wed Nov 14 11:28:02 2012 +0100 +++ b/hotspot/.project Wed Nov 14 11:29:32 2012 +0100 @@ -106,11 +106,21 @@ <locationURI>WORKSPACE_LOC/make</locationURI> </link> <link> + <name>bsd</name> + <type>2</type> + <locationURI>PARENT-1-PROJECT_LOC/src/os/bsd/vm</locationURI> + </link> + <link> <name>linux</name> <type>2</type> <locationURI>PARENT-1-PROJECT_LOC/src/os/linux/vm</locationURI> </link> <link> + <name>bsd_x86</name> + <type>2</type> + <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/bsd_x86/vm</locationURI> + </link> + <link> <name>linux_x86</name> <type>2</type> <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI>