hg: graal/graal: 67 new changesets

doug.simon at oracle.com doug.simon at oracle.com
Wed Mar 21 07:57:57 PDT 2012


Changeset: f2d2fb93daad
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-08 16:39 -0800
URL:       http://hg.openjdk.java.net/graal/graal/rev/f2d2fb93daad

fixed debug/fastdebug warning message

! src/share/vm/utilities/ostream.cpp

Changeset: bb290d53a338
Author:    Andreas Woess <andreas.woess at jku.at>
Date:      2012-03-09 17:12 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/bb290d53a338

Remove method callback.

! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolvedImpl.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! src/share/vm/graal/graalJavaAccess.hpp

Changeset: 6e7c1fb1980f
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-09 13:14 -0800
URL:       http://hg.openjdk.java.net/graal/graal/rev/6e7c1fb1980f

enabled wrappers for native method calls

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
! src/share/vm/graal/graalCompiler.hpp

Changeset: b593e82d9309
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-11 13:11 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/b593e82d9309

Merge.


Changeset: 9d055af068a8
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-14 13:54 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/9d055af068a8

Made Java builds look for mx/ecj.jar to use Eclipse batch compiler by default.

Made library paths absolute in generated Eclipse configuration to avoid issues with how relative paths are interpreted (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737).

! mxtool/mx.py

Changeset: f6503609a12d
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-14 14:09 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/f6503609a12d

Made the Eclipse properties be automatically generated if they don't exist when building with the Eclipse batch compiler.

! mxtool/mx.py

Changeset: 2db1ad9dd385
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 16:57 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/2db1ad9dd385

rename PiNode.value to PiNode.object and UnsafeCastNode.x to UnsafeCastNode.object

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java

Changeset: ad00d1d02ed2
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:07 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/ad00d1d02ed2

change MergeableState to use List<T> instead of Collection<T>

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/graph/MergeableState.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/ComputeProbabilityPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/schedule/UnscheduleNodes.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypesPhase.java

Changeset: 47e317d6c71d
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:08 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/47e317d6c71d

add NodeList.addAll(T[])

! graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeList.java

Changeset: 01ffb0fc9aec
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:14 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/01ffb0fc9aec

propagate stamps while lowering

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/FloatingReadPhase.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeAccessNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java

Changeset: 107ede924db3
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:15 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/107ede924db3

fix to Condition.implies

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/Condition.java

Changeset: 0bc48f48e5e5
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:17 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/0bc48f48e5e5

let PostOrderBlockIterator iterate loops multiple times

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PostOrderBlockIterator.java

Changeset: f8fe72ce4adc
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:22 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/f8fe72ce4adc

fix typos and remove unused parameters

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PostOrderBlockIterator.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeAccessNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java

Changeset: 68918a528cbe
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:23 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/68918a528cbe

experimental: dependencies on all ValueNodes

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BooleanNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatingNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java

Changeset: 3e21269ee901
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:42 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/3e21269ee901

experimental type storage/query infrastructure, part 1

+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/CloneableTypeFeedback.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackStore.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackTool.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeQuery.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeFeedbackStore.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeFeedbackTool.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeQuery.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeFeedbackChanged.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeFeedbackStore.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeQuery.java

Changeset: f29e75070bb6
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:46 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/f29e75070bb6

experimental type storage/query infrastructure, part 2: type feedback

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerAddNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeFeedbackProvider.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeFeedbackTool.java

Changeset: 1093243c09ad
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:50 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/1093243c09ad

experimental type storage/query infrastructure, part 3:
split/conditional type feedback, type canonicalization

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ConditionalTypeFeedbackProvider.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/SplitTypeFeedbackProvider.java
+ graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeCanonicalizable.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/TypeFeedbackTool.java

Changeset: 77aa8141ba41
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:55 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/77aa8141ba41

experimental type storage/query infrastructure, part 4:
type cache, stamp changes

+ graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/NegateObjectTypeFeedback.java
+ graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/NegateScalarTypeFeedback.java
+ graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/TypeFeedbackCache.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/Stamp.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java

Changeset: 5bdaa08ba96b
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 17:59 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/5bdaa08ba96b

add and enable new PropagateTypeCachePhase, add type system tests

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java
+ graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypeCachePhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypesPhase.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraphTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/ScalarTypeSystemTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/TypeSystemTest.java

Changeset: ed53c5f8244b
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 18:00 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/ed53c5f8244b

remove old PropagateTypesPhase

- graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypesPhase.java

Changeset: 0c968a6e0ca0
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-14 18:00 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/0c968a6e0ca0

disable PropagateTypes option

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java

Changeset: 74a0bbd671ba
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-14 21:54 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/74a0bbd671ba

Added mx/ecj.jar to .hgignore

! .hgignore

Changeset: 206e68bb66c6
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-15 08:23 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/206e68bb66c6

Made the IdealGraphVisualizer runnable from mx with new 'igv' command.

! .hgignore
! mx/commands.py
! src/share/tools/IdealGraphVisualizer/nbproject/platform.properties

Changeset: 0a1e5b876667
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-16 14:47 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/0a1e5b876667

Disabled 'examples' command until the examples are revived.

! mx/commands.py

Changeset: 54819cdcca7f
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-16 14:48 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/54819cdcca7f

Added -V option to mx for 'very verbose'which prints the environment variables used for an external command.

! mxtool/mx.py

Changeset: 3d91d5d7b166
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-16 18:25 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/3d91d5d7b166

fixed segv encountered while printing system property with a NULL value

! src/share/vm/utilities/ostream.cpp

Changeset: ba5e8ba07b5c
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-16 20:03 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/ba5e8ba07b5c

compiler.class.path should not include system class path

! src/share/vm/runtime/arguments.cpp

Changeset: d3f547b08304
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-16 20:23 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/d3f547b08304

added mechanism for disabling automatic native builds from the IDE (set IDE_BUILD_TARGET="" in mx/env)

! hotspot/.cproject
! hotspot/.project
! mx/commands.py

Changeset: 57ae0b1cc74a
Author:    Andreas Woess <andreas.woess at jku.at>
Date:      2012-03-16 19:23 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/57ae0b1cc74a

Fix possible endless recursion in ConvertDeoptimizeToGuardPhase.

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/ConvertDeoptimizeToGuardPhase.java

Changeset: 56a53c80ad2b
Author:    Andreas Woess <andreas.woess at jku.at>
Date:      2012-03-16 19:30 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/56a53c80ad2b

Fix intrinsification of an invoke with exception with a deoptimize node.

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java

Changeset: 5d0925455be1
Author:    Gilles Duboscq <duboscq at ssw.jku.at>
Date:      2012-03-19 11:55 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/5d0925455be1

Canonicalize some filter usages. Fix for graph printer's escape (escape invalid control chars). Small comment fixes

! graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
! graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopInline.java
! graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BasicIdealGraphPrinter.java

Changeset: 1f7d2ab7497b
Author:    Gilles Duboscq <duboscq at ssw.jku.at>
Date:      2012-03-19 11:57 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/1f7d2ab7497b

inputs in a NodeInputList can be null, allow adding null values to NodeInputList (consistent with NodeSuccessorList)

! graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeInputList.java

Changeset: e35e2aa5ebad
Author:    Gilles Duboscq <duboscq at ssw.jku.at>
Date:      2012-03-19 11:57 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/e35e2aa5ebad

Run the canonicalizer early

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java

Changeset: d8b414300a2e
Author:    Gilles Duboscq <duboscq at ssw.jku.at>
Date:      2012-03-19 11:58 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/d8b414300a2e

getClass's intrinsic ReadNode floats, use a FloatingReadNode

! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java

Changeset: f61058a128d3
Author:    Gilles Duboscq <duboscq at ssw.jku.at>
Date:      2012-03-19 12:01 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/f61058a128d3

Consitency in killCFG : kill the loop  before deleteing the loopbegin when removing a dead loop

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java

Changeset: 09f638813477
Author:    Andreas Woess <andreas.woess at jku.at>
Date:      2012-03-19 13:33 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/09f638813477

Relax an assertion that would incorrectly fail for boxed virtual objects.

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java

Changeset: 276e14614531
Author:    Doug Simon <doug.simon at oracle.com>
Date:      2012-03-20 14:43 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/276e14614531

Added jdkhome command to mx.

! mx/commands.py

Changeset: 9ec2917fd0de
Author:    Andreas Woess <andreas.woess at jku.at>
Date:      2012-03-20 17:13 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/9ec2917fd0de

Allow ints to be put into a virtual long array.

! src/share/vm/graal/graalCodeInstaller.cpp

Changeset: 95b8a32a7cc3
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-12 18:40 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/95b8a32a7cc3

preparations to avoid endless recompilations because of not updated profiling information

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64DeoptimizationStub.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolvedImpl.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java
+ graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptAction.java
+ graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseProfilingInfo.java
! src/share/vm/graal/graalCompiler.cpp
! src/share/vm/oops/methodOop.cpp

Changeset: e99213cfe7d5
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-12 18:40 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/e99213cfe7d5

removed unnecessary file

- graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotNoProfilingInfo.java

Changeset: 85a47e2a415d
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-13 10:41 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/85a47e2a415d

bugfix

! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderConfiguration.java

Changeset: b07ead3a3c2c
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-13 12:01 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/b07ead3a3c2c

fixed case when exception probability should not be used

! graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderConfiguration.java

Changeset: 6766253384bf
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-13 18:53 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/6766253384bf

more preparations for disabling runtime feedback selectively based on deoptimization history

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/ConvertDeoptimizeToGuardPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/PhasePlan.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64DeoptimizationStub.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java
+ graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/ProfilingInfoConfiguration.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/CiLoweringTool.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java
! graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/GraalIntrinsics.java
! graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippets.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/BoxingEliminationTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/CompiledMethodTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/EscapeAnalysisTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraphTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/IfBoxingEliminationTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/InvokeExceptionTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/InvokeTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/MonitorTest.java
+ graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptReason.java
! src/cpu/x86/vm/sharedRuntime_x86_64.cpp

Changeset: 0ebca2e35ca5
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-15 15:31 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/0ebca2e35ca5

more preparations for disabling runtime feedback selectively based on deoptimization history

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64DeoptimizationStub.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/CiLoweringTool.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptAction.java < graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptReason.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptReason.java < graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptReason.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java
- graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptAction.java
! src/share/vm/c1/c1_Runtime1.cpp
! src/share/vm/prims/jvmtiEnv.cpp
! src/share/vm/prims/jvmtiEnvBase.cpp
! src/share/vm/prims/jvmtiImpl.cpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/deoptimization.hpp
! src/share/vm/runtime/safepoint.cpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/runtime/vmStructs.cpp
! src/share/vm/runtime/vm_operations.cpp
! src/share/vm/runtime/vm_operations.hpp

Changeset: 422c979ff392
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-15 16:34 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/422c979ff392

fixed two cases where DeoptAction was invalid

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64DeoptimizationStub.java
! src/cpu/x86/vm/c1_Runtime1_x86.cpp
! src/cpu/x86/vm/sharedRuntime_x86_64.cpp
! src/share/vm/code/codeBlob.hpp
! src/share/vm/oops/methodDataOop.hpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/sharedRuntime.hpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/runtime/vm_operations.cpp

Changeset: 88c339d1d617
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-15 17:01 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/88c339d1d617

added EndlessRecompilationTest

+ graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/EndlessRecompilationTest.java

Changeset: e6a45067e42c
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-15 17:01 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/e6a45067e42c

removed EndlessRecompilationTest

- graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/EndlessRecompilationTest.java

Changeset: dad1ac9dba7d
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-19 14:43 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/dad1ac9dba7d

finished first implementation of disabling runtime feedback selectively based on deoptimization history

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java
+ graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64DeoptimizationStub.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java
- graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/ProfilingInfoConfiguration.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodData.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolvedImpl.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotProfilingInfo.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotXirGenerator.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/CiLoweringTool.java
- graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptAction.java
- graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptReason.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java
! graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Snippets.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/BoxingEliminationTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/CompiledMethodTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/EscapeAnalysisTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraphTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/IfBoxingEliminationTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/InvokeExceptionTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/InvokeTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/MonitorTest.java
+ graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptAction.java
+ graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiDeoptReason.java
! graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiProfilingInfo.java
! graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java
! graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseProfilingInfo.java
! src/share/vm/graal/graalCompilerToVM.cpp
! src/share/vm/oops/methodDataOop.hpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/deoptimization.hpp
! src/share/vm/utilities/macros.hpp

Changeset: c7d57d0d668a
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-19 14:54 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/c7d57d0d668a

bugfix

! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotMethodResolvedImpl.java

Changeset: 312b18b9cc3a
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-19 15:08 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/312b18b9cc3a

added output when optimistic optimizations are disabled

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java

Changeset: b6d1ba51d163
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-19 15:47 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/b6d1ba51d163

minor changes

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java
! src/share/vm/runtime/deoptimization.hpp
! src/share/vm/runtime/vmStructs.cpp

Changeset: e5427faad192
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-19 15:51 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/e5427faad192

Merge

- GRAAL_README
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/ConvertDeoptimizeToGuardPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java
- graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/types/PropagateTypesPhase.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraphTest.java

Changeset: 352a95d5031c
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-19 16:22 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/352a95d5031c

minor cleanups after merge

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! src/share/vm/runtime/vmStructs.cpp

Changeset: 37e75b4de85e
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-20 08:24 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/37e75b4de85e

Merge


Changeset: 34518fd74518
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-20 08:34 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/34518fd74518

fixed fastdebug C++ issue

! src/share/vm/runtime/deoptimization.cpp

Changeset: 9b940aff6c6b
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-20 10:32 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/9b940aff6c6b

fixed failing testcases

! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraphScheduleTest.java
! graal/com.oracle.graal.tests/src/com/oracle/graal/compiler/tests/GraphTest.java

Changeset: 3d0556d10a2b
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-20 10:33 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/3d0556d10a2b

Merge


Changeset: 837a304d0ca8
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-20 11:45 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/837a304d0ca8

C1 bugfix, fixed C1 compilation errors

! src/cpu/x86/vm/c1_Runtime1_x86.cpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/sharedRuntime.hpp

Changeset: 4a1894e1cfc7
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-20 12:16 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/4a1894e1cfc7

fixed C2 compilation error

! src/share/vm/opto/runtime.cpp

Changeset: 43d5ae1051f7
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-20 16:15 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/43d5ae1051f7

added better debug output when an optimistic deoptimization is disabled
fixed inconsistent newline characters in C++ file

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java
! src/share/vm/graal/graalCodeInstaller.cpp
! src/share/vm/runtime/compilationPolicy.hpp

Changeset: 7b2efb5ff2ea
Author:    Christian Haeubl <christian.haeubl at oracle.com>
Date:      2012-03-20 17:56 -0700
URL:       http://hg.openjdk.java.net/graal/graal/rev/7b2efb5ff2ea

better inlining debug output
avoid inlining if callee is marked to use fewer optimistic optimizations than caller

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/OptimisticOptimizations.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java

Changeset: e2da6471a9a1
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-16 11:03 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/e2da6471a9a1

better MethodFilter (allows filtering by class, method name and parameter types)

! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java
+ graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java

Changeset: 51111665eda6
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-21 10:47 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/51111665eda6

Support for recording a leaf graph id for each deoptimization point in the debug info.

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/ConvertDeoptimizeToGuardPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/CiLoweringTool.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/GraalRuntime.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeAccessNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ObjectTypeFeedbackStore.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/types/ScalarTypeFeedbackStore.java
! graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiCodePos.java
! graal/com.oracle.max.cri/src/com/oracle/max/cri/ci/CiFrame.java
! src/share/vm/c1/c1_IR.cpp
! src/share/vm/code/debugInfoRec.cpp
! src/share/vm/code/debugInfoRec.hpp
! src/share/vm/code/pcDesc.cpp
! src/share/vm/code/pcDesc.hpp
! src/share/vm/graal/graalCodeInstaller.cpp
! src/share/vm/graal/graalCompiler.cpp
! src/share/vm/graal/graalCompiler.hpp
! src/share/vm/graal/graalCompilerToVM.cpp
! src/share/vm/graal/graalJavaAccess.hpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/mutexLocker.cpp
! src/share/vm/runtime/mutexLocker.hpp
! src/share/vm/utilities/macros.hpp

Changeset: ab038e0d6b43
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-21 11:28 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/ab038e0d6b43

Merge

! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/ConvertDeoptimizeToGuardPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LoweringPhase.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/amd64/AMD64LIRGenerator.java
! graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java
- graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotNoProfilingInfo.java
! graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
! graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/cri/CiLoweringTool.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeWriteNode.java
! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java
! src/share/vm/code/nmethod.hpp
! src/share/vm/graal/graalCodeInstaller.cpp
! src/share/vm/graal/graalCompiler.cpp
! src/share/vm/graal/graalCompilerToVM.cpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/utilities/macros.hpp

Changeset: e307e8104e12
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-21 11:57 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/e307e8104e12

fix for non-graal builds

! src/share/vm/code/pcDesc.hpp

Changeset: e1a03c81cef0
Author:    Lukas Stadler <lukas.stadler at jku.at>
Date:      2012-03-21 13:05 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/e1a03c81cef0

another fix for non-graal builds

! src/share/vm/opto/output.cpp
! src/share/vm/shark/sharkCacheDecache.cpp

Changeset: def0b7331cca
Author:    Andreas Woess <andreas.woess at jku.at>
Date:      2012-03-21 12:11 +0100
URL:       http://hg.openjdk.java.net/graal/graal/rev/def0b7331cca

Fixed DeoptimizeNode.deopt intrinsic.

! graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java



More information about the graal-dev mailing list