changeset 30807:c9db749674df

Merge
author amurillo
date Tue, 26 May 2015 09:22:39 -0700
parents 6e9d62b1dbc3 e83745d58046
children 6257b2441b5f
files hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMap.java hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.gif hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/link.gif hotspot/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.gif hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphCountGroupOrganizer.java hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/StructuredViewAction.java hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.gif hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.gif hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.gif hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.gif hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.gif hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.gif hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.gif hotspot/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.gif hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupOrganizer.java hotspot/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupReceiver.java hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/JavaSE6ScriptEngine.java hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/NullScriptEngine.java hotspot/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ScriptEngineAbstraction.java hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.gif hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.gif hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.gif hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.gif hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.gif hotspot/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.gif hotspot/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Source.java hotspot/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/OldHierarchicalLayoutManager.java hotspot/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupReceiver hotspot/src/share/tools/IdealGraphVisualizer/README hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/build.xml hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/manifest.mf hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/build-impl.xml hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/genfiles.properties hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/project.properties hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/project.xml hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/suite.properties hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/Bundle.properties hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/RhinoScriptEngine.java hotspot/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/layer.xml hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/JavaGroupOrganizer.java hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/combine.filter hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/extendedColor.filter hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/linestyle.filter hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeMemory.filter hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeRootInputs.filter hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSafepointInputs.filter hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSelfLoops.filter hotspot/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/split.filter hotspot/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.gif hotspot/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.InputGraphProvider hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ConnectionAnchor.java hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedPanAction.java hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/FindPanel.java hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/PreferenceConstants.java hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/SlotLayout.java hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NodeFindAction.java hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.gif hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.gif hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/search.gif hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoomin.gif hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoomout.gif hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/DiagramConnectionWidget.java hotspot/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/MultiConnectionWidget.java hotspot/test/testlibrary/com/oracle/java/testlibrary/Asserts.java hotspot/test/testlibrary/com/oracle/java/testlibrary/BuildHelper.java hotspot/test/testlibrary/com/oracle/java/testlibrary/ByteCodeLoader.java hotspot/test/testlibrary/com/oracle/java/testlibrary/DynamicVMOption.java hotspot/test/testlibrary/com/oracle/java/testlibrary/ExitCode.java hotspot/test/testlibrary/com/oracle/java/testlibrary/InMemoryJavaCompiler.java hotspot/test/testlibrary/com/oracle/java/testlibrary/InfiniteLoop.java hotspot/test/testlibrary/com/oracle/java/testlibrary/InputArguments.java hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java hotspot/test/testlibrary/com/oracle/java/testlibrary/JDKToolLauncher.java hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputBuffer.java hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounter.java hotspot/test/testlibrary/com/oracle/java/testlibrary/PerfCounters.java hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java hotspot/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java hotspot/test/testlibrary/com/oracle/java/testlibrary/StreamPumper.java hotspot/test/testlibrary/com/oracle/java/testlibrary/TimeLimitedRunner.java hotspot/test/testlibrary/com/oracle/java/testlibrary/Utils.java hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/CPUSpecificCommandLineOptionTest.java hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/CommandLineOptionTest.java hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/predicate/AndPredicate.java hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/predicate/CPUSpecificPredicate.java hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/predicate/NotPredicate.java hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/predicate/OrPredicate.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dcmd/CommandExecutor.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dcmd/CommandExecutorException.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dcmd/FileJcmdExecutor.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dcmd/JMXExecutor.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dcmd/JcmdExecutor.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dcmd/MainClassJcmdExecutor.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dcmd/PidJcmdExecutor.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dtrace/DtraceResultsAnalyzer.java hotspot/test/testlibrary/com/oracle/java/testlibrary/dtrace/DtraceRunner.java jaxp/test/javax/xml/jaxp/TEST.properties jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6979306Test.java jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8003147Test.java jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6551616.java jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CLITest.java jdk/src/bsd/doc/man/ja/native2ascii.1 jdk/src/bsd/doc/man/native2ascii.1 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/package.html jdk/src/java.base/share/classes/com/sun/net/ssl/package.html jdk/src/java.base/share/classes/java/io/package.html jdk/src/java.base/share/classes/java/lang/ref/package.html jdk/src/java.base/share/classes/java/nio/channels/spi/package.html jdk/src/java.base/share/classes/java/nio/charset/package.html jdk/src/java.base/share/classes/java/nio/charset/spi/package.html jdk/src/java.base/share/classes/java/nio/package.html jdk/src/java.base/share/classes/java/text/package.html jdk/src/java.base/share/classes/java/text/spi/package.html jdk/src/java.base/share/classes/java/util/jar/package.html jdk/src/java.base/share/classes/java/util/package.html jdk/src/java.base/share/classes/java/util/regex/package.html jdk/src/java.base/share/classes/java/util/spi/package.html jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html jdk/src/java.base/share/classes/javax/crypto/package.html jdk/src/java.base/share/classes/javax/crypto/spec/package.html jdk/src/java.base/share/classes/javax/net/package.html jdk/src/java.base/share/classes/javax/net/ssl/package.html jdk/src/java.base/share/classes/sun/reflect/package.html jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/A2NFilter.java jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/Main.java jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/N2AFilter.java jdk/src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java jdk/test/TEST.groups jdk/test/sun/tools/jhat/hprof.bin jdk/test/sun/tools/jhat/jmap.bin jdk/test/sun/tools/jhat/minimal.bin jdk/test/sun/tools/native2ascii/A2N_4630463 jdk/test/sun/tools/native2ascii/A2N_4630463.expected jdk/test/sun/tools/native2ascii/A2N_4630971 jdk/test/sun/tools/native2ascii/A2N_4701617 jdk/test/sun/tools/native2ascii/A2N_4701617.expected jdk/test/sun/tools/native2ascii/A2N_6247817 jdk/test/sun/tools/native2ascii/N2A_4636448 jdk/test/sun/tools/native2ascii/N2A_4636448.expected jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh jdk/test/sun/tools/native2ascii/NativeErrors.java jdk/test/sun/tools/native2ascii/Permission.java jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.java jdk/test/sun/tools/native2ascii/test1 jdk/test/sun/tools/native2ascii/test3 langtools/test/tools/javac/5005368.java langtools/test/tools/javac/generics/InterfaceCast1.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java
diffstat 2733 files changed, 42608 insertions(+), 26805 deletions(-) [+]