Mercurial > hg > graal-compiler
changeset 19814:4bc952439f2a
Merge
| author | Stefan Anzinger <stefan.anzinger@oracle.com> |
|---|---|
| date | Thu, 12 Mar 2015 15:59:01 +0100 |
| parents | a67fe68c25c5 (diff) ad32fd810c83 (current diff) |
| children | 7ee442766685 9f1404a45a6f |
| files | graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypeRewriterPhase.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BlackholeSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BoxingSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/CharacterSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ClassSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DoubleSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/EdgesSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/FloatSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalDirectivesSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ShortSubstitutions.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/UnsignedMathSubstitutions.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/CompilerDirectivesSubstitutions.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/ExactMathSubstitutions.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/FrameWithoutBoxingSubstitutions.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/OptimizedCallTargetSubstitutions.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/UnsafeAccessSubstitutions.java graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeVerificationPhase.java |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/.project Thu Mar 12 12:45:04 2015 +0100 +++ b/hotspot/.project Thu Mar 12 15:59:01 2015 +0100 @@ -121,6 +121,16 @@ <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_sparc/vm</locationURI> </link> <link> + <name>solaris_sparc</name> + <type>2</type> + <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/solaris_sparc/vm</locationURI> + </link> + <link> + <name>solaris</name> + <type>2</type> + <locationURI>PARENT-1-PROJECT_LOC/src/os/solaris/vm</locationURI> + </link> + <link> <name>linux_x86</name> <type>2</type> <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI>
--- a/src/os/solaris/vm/os_solaris.cpp Thu Mar 12 12:45:04 2015 +0100 +++ b/src/os/solaris/vm/os_solaris.cpp Thu Mar 12 15:59:01 2015 +0100 @@ -2674,6 +2674,8 @@ if (!recoverable_mmap_error(err)) { warn_fail_commit_memory(addr, bytes, exec, err); + // Introduced temporarily to debug the memory allocation issues on Solaris + tty->print_cr("GRAAL_DEBUG: unrecoverable error during mmap got errno %d", err); vm_exit_out_of_memory(bytes, OOM_MMAP_ERROR, "committing reserved memory."); }