hg: jdk/submit: Merge

zgu at redhat.com zgu at redhat.com
Mon Jul 30 21:57:20 UTC 2018


Changeset: 7da217e72211
Author:    zgu
Date:      2018-07-30 17:56 -0400
URL:       http://hg.openjdk.java.net/jdk/submit/rev/7da217e72211

Merge

- make/data/symbols/java.base-6.sym.txt
- make/data/symbols/java.compiler-6.sym.txt
- make/data/symbols/java.desktop-6.sym.txt
- make/data/symbols/java.logging-6.sym.txt
- make/data/symbols/java.management-6.sym.txt
- make/data/symbols/java.rmi-6.sym.txt
- make/data/symbols/java.security.jgss-6.sym.txt
- make/data/symbols/java.sql-6.sym.txt
- make/data/symbols/java.sql.rowset-6.sym.txt
- make/data/symbols/java.xml-6.sym.txt
- make/data/symbols/java.xml.bind-6.sym.txt
- make/data/symbols/java.xml.ws-6.sym.txt
- make/data/symbols/java.xml.ws.annotation-6.sym.txt
- make/data/symbols/jdk.management-6.sym.txt
- make/data/symbols/jdk.sctp-6.sym.txt
- make/data/symbols/jdk.security.jgss-6.sym.txt
! src/hotspot/share/services/memTracker.cpp
- test/hotspot/gtest/utilities/utilitiesHelper.inline.hpp
- test/hotspot/jtreg/applications/jcstress/acqrel/Test.java
- test/hotspot/jtreg/applications/jcstress/atomicity/Test.java
- test/hotspot/jtreg/applications/jcstress/copy/Test.java
- test/hotspot/jtreg/applications/jcstress/fences/Test.java
- test/hotspot/jtreg/applications/jcstress/memeffects/Test.java
- test/hotspot/jtreg/applications/jcstress/other/Test.java
- test/hotspot/jtreg/applications/jcstress/seqcst.sync/Test.java
- test/hotspot/jtreg/applications/jcstress/seqcst.volatiles/Test.java
- test/hotspot/jtreg/compiler/graalunit/JttLangMTest.java
- test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java
- test/hotspot/jtreg/runtime/appcds/MismatchedUseAppCDS.java
- test/hotspot/jtreg/runtime/appcds/test-classes/CheckIfShared.java
- test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java
- test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html
- test/jdk/java/lang/System/SetProperties.java
- test/langtools/tools/javac/6558548/T6558548_6.out
- test/langtools/tools/javac/8013179/T8013179.java
- test/langtools/tools/javac/8013179/T8013179.out
- test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out
- test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out
- test/langtools/tools/javac/StringsInSwitch/NonConstantLabel6.out
- test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.out
- test/langtools/tools/javac/StringsInSwitch/RSCL1_6.out
- test/langtools/tools/javac/StringsInSwitch/RSCL2_6.out
- test/langtools/tools/javac/TryWithResources/BadTwr6.out
- test/langtools/tools/javac/TryWithResources/BadTwrSyntax6.out
- test/langtools/tools/javac/TryWithResources/PlainTry6.out
- test/langtools/tools/javac/TryWithResources/TwrOnNonResource6.out
- test/langtools/tools/javac/TryWithResources/WeirdTwr.out
- test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out
- test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out
- test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified6.out
- test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple6.out
- test/langtools/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java
- test/langtools/tools/javac/diags/examples/MulticatchNotSupported.java
- test/langtools/tools/javac/diags/examples/StringSwitchNotSupported.java
- test/langtools/tools/javac/diags/examples/TryResourceNotSupported.java
- test/langtools/tools/javac/diags/examples/TryWithoutCatchOrFinally.java
- test/langtools/tools/javac/diags/examples/UnsupportedBinaryLiteral.java
- test/langtools/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java
- test/langtools/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java
- test/langtools/tools/javac/literals/BadBinaryLiterals.6.out
- test/langtools/tools/javac/literals/BadUnderscoreLiterals.6.out
- test/langtools/tools/javac/processing/environment/round/AnnotatedElementInfo.java
- test/langtools/tools/javac/types/CastObjectToPrimitiveTest.out
- test/langtools/tools/javac/warnings/6594914/T6594914b.out



More information about the jdk-submit-changes mailing list