changeset 31294:17141bf8c07f

Merge
author duke
date Wed, 05 Jul 2017 20:39:35 +0200
parents 9b8258eb95a9 76bfac1e65f5
children 0aaa77710f37
files hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedSparcCPU.java hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedSparcCPU.java hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedSparcCPU.java hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedSparcCPU.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_AU.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_CA.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_GB.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_IE.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_IN.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_MT.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_NZ.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_PH.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_SG.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_US.java jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_ZA.java jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_GB.java jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_SG.java jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_GB.properties jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_IE.properties jdk/src/java.base/share/classes/sun/util/resources/en/CalendarData_en_MT.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_AU.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_CA.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_GB.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_IE.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_IN.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_MT.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_NZ.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_PH.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_SG.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_US.properties jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_ZA.properties jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_MT.properties jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_PH.properties jdk/src/java.base/share/classes/sun/util/resources/en/LocaleNames_en_SG.properties jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_CA.java jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_GB.java jdk/src/java.base/share/classes/sun/util/resources/en/TimeZoneNames_en_IE.java jdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunECEntries.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_JO.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_LB.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_SY.java jdk/src/jdk.localedata/share/classes/sun/text/resources/be/FormatData_be_BY.java jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/FormatData_bg_BG.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/FormatData_ca_ES.java jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/FormatData_cs_CZ.java jdk/src/jdk.localedata/share/classes/sun/text/resources/da/FormatData_da_DK.java jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_AT.java jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_CH.java jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_DE.java jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_LU.java jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el_CY.java jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el_GR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_AR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_BO.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CL.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CO.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_DO.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_EC.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_ES.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_GT.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_HN.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_MX.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_NI.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PA.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PE.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_PY.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_SV.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_US.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_UY.java jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_VE.java jdk/src/jdk.localedata/share/classes/sun/text/resources/et/FormatData_et_EE.java jdk/src/jdk.localedata/share/classes/sun/text/resources/fi/FormatData_fi_FI.java jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_BE.java jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_CA.java jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_CH.java jdk/src/jdk.localedata/share/classes/sun/text/resources/fr/FormatData_fr_FR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ga/FormatData_ga_IE.java jdk/src/jdk.localedata/share/classes/sun/text/resources/hi/FormatData_hi_IN.java jdk/src/jdk.localedata/share/classes/sun/text/resources/hi/JavaTimeSupplementary_hi_IN.java jdk/src/jdk.localedata/share/classes/sun/text/resources/hr/FormatData_hr_HR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/hu/FormatData_hu_HU.java jdk/src/jdk.localedata/share/classes/sun/text/resources/in/FormatData_in_ID.java jdk/src/jdk.localedata/share/classes/sun/text/resources/is/FormatData_is_IS.java jdk/src/jdk.localedata/share/classes/sun/text/resources/it/FormatData_it_CH.java jdk/src/jdk.localedata/share/classes/sun/text/resources/it/FormatData_it_IT.java jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/FormatData_iw_IL.java jdk/src/jdk.localedata/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw_IL.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ja/FormatData_ja_JP.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ko/FormatData_ko_KR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/lt/FormatData_lt_LT.java jdk/src/jdk.localedata/share/classes/sun/text/resources/lv/FormatData_lv_LV.java jdk/src/jdk.localedata/share/classes/sun/text/resources/mk/FormatData_mk_MK.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ms/FormatData_ms_MY.java jdk/src/jdk.localedata/share/classes/sun/text/resources/mt/FormatData_mt_MT.java jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/FormatData_nl_BE.java jdk/src/jdk.localedata/share/classes/sun/text/resources/nl/FormatData_nl_NL.java jdk/src/jdk.localedata/share/classes/sun/text/resources/no/FormatData_no_NO.java jdk/src/jdk.localedata/share/classes/sun/text/resources/no/FormatData_no_NO_NY.java jdk/src/jdk.localedata/share/classes/sun/text/resources/pl/FormatData_pl_PL.java jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/FormatData_pt_BR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/FormatData_pt_PT.java jdk/src/jdk.localedata/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt_PT.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ro/FormatData_ro_RO.java jdk/src/jdk.localedata/share/classes/sun/text/resources/ru/FormatData_ru_RU.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sk/FormatData_sk_SK.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sl/FormatData_sl_SI.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sq/FormatData_sq_AL.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_BA.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_CS.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_Latn_ME.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_ME.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sr/FormatData_sr_RS.java jdk/src/jdk.localedata/share/classes/sun/text/resources/sv/FormatData_sv_SE.java jdk/src/jdk.localedata/share/classes/sun/text/resources/th/FormatData_th_TH.java jdk/src/jdk.localedata/share/classes/sun/text/resources/tr/FormatData_tr_TR.java jdk/src/jdk.localedata/share/classes/sun/text/resources/uk/FormatData_uk_UA.java jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/FormatData_vi_VN.java jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/CollationData_zh_HK.java jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/CollationData_zh_TW.java jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_CN.java jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_HK.java jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_SG.java jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/FormatData_zh_TW.java jdk/src/jdk.localedata/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh_TW.java jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/LICENSE jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldml.dtd jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/dtd/ldmlSupplemental.dtd jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_DJ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ER.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/aa_ET.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_NA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/af_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/agq_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ak_GH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/am.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/am_ET.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_001.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_AE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_BH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_DZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_EG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_IQ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_JO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_KW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LB.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_LY.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_MA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_OM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_QA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_SY.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_TN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ar_YE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/as.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/as_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/asa_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Cyrl_AZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/az_Latn_AZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bas_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/be.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/be_BY.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bem_ZM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bez_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bg_BG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bm_ML.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_BD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bn_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_CN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bo_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/br.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/br_FR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/brx_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/bs_BA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/byn_ER.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ca_ES.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cgg_UG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/chr_US.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cs_CZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/cy_GB.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/da.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/da_DK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dav_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_AT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_BE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_CH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_DE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/de_LU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dje_NE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dua_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dyo_SN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/dz_BT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ebu_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_GH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ee_TG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_CY.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/el_GR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AS.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_AU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BB.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_BZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_CA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_Dsrt_US.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GB.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_GY.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_HK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_JM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MP.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_MU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_NZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_PK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_SG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_TT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_UM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_US_POSIX.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_VI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/en_ZW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_419.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_AR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_BO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CL.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_CR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_DO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_EC.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_ES.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GQ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_GT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_HN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_MX.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_NI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_PY.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_SV.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_US.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_UY.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/es_VE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/et.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/et_EE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/eu_ES.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ewo_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_AF.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fa_IR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ff_SN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fi_FI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fil_PH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fo_FO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BF.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BJ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_BL.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CF.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_DJ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_FR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GF.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GP.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_GQ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_KM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_LU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MC.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MF.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_ML.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_MQ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_NE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_RW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_SN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_TG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fr_YT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/fur_IT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ga_IE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gd_GB.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gl_ES.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gsw_CH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gu_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/guz_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/gv_GB.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_GH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ha_Latn_NG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/haw_US.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/he.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/he_IL.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hi_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hr_HR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hu_HU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/hy_AM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ia.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/id.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/id_ID.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ig_NG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ii_CN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/is.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/is_IS.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_CH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/it_IT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ja_JP.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/jmc_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ka_GE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kab_DZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kam_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kde_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kea_CV.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/khq_ML.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ki_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kk_Cyrl_KZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kl_GL.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kln_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/km.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/km_KH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kn_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ko_KR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kok_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksb_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksf_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ksh_DE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/kw_GB.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lag_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lg_UG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ln_CG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lo_LA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lt_LT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lu_CD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luo_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/luy_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/lv_LV.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mas_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mer_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mfe_MU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mg_MG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mgh_MZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mk_MK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ml_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mr_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_BN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ms_MY.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mt_MT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/mua_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/my.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/my_MM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/naq_NA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nb_NO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nd_ZW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ne_NP.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_AW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_BE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_CW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_NL.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nl_SX.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nmg_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nn_NO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nr_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nso_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nus_SD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/nyn_UG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_ET.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/om_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/or.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/or_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Arab_PK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pa_Guru_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pl_PL.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ps_AF.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_AO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_BR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_GW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_MZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_PT.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/pt_ST.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rm_CH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rn_BI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_MD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ro_RO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rof_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/root.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_MD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_RU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ru_UA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rw_RW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/rwk_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sah_RU.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/saq_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sbp_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_FI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/se_NO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/seh_MZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ses_ML.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sg_CF.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Latn_MA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/shi_Tfng_MA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/si.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/si_LK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sk_SK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sl_SI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sn_ZW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_DJ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_ET.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/so_SO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sq_AL.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_BA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_ME.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Cyrl_RS.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_BA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_ME.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sr_Latn_RS.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_SZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ss_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ssy_ER.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_LS.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/st_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_FI.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sv_SE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/sw_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/swc_CD.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ta_LK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/te.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/te_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_KE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/teo_UG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tg_Cyrl_TJ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/th.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/th_TH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ER.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ti_ET.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tig_ER.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tn_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/to.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/to_TO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tr_TR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ts_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/twq_NE.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/tzm_Latn_MA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uk_UA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_IN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ur_PK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Arab_AF.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Cyrl_UZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/uz_Latn_UZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Latn_LR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vai_Vaii_LR.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/ve_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vi_VN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/vun_TZ.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wae_CH.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/wal_ET.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xh_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/xog_UG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yav_CM.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/yo_NG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_CN.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_HK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_MO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hans_SG.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_HK.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_MO.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zh_Hant_TW.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/main/zu_ZA.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/metaZones.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/numberingSystems.xml jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources/21_0_1/common/supplemental/supplementalData.xml jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_AE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_BH.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_DZ.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_EG.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_IQ.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_JO.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_KW.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_LB.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_LY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_MA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_OM.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_QA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SD.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_SY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_TN.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ar/CurrencyNames_ar_YE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/be/CurrencyNames_be_BY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/bg/CurrencyNames_bg_BG.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ca/CurrencyNames_ca_ES.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/cs/CurrencyNames_cs_CZ.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/da/CurrencyNames_da_DK.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_AT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_CH.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_DE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_GR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/de/CurrencyNames_de_LU.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CalendarData_el_CY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CurrencyNames_el_CY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/el/CurrencyNames_el_GR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/el/LocaleNames_el_CY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CalendarData_es_ES.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CalendarData_es_US.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_AR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_BO.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CL.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CO.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_CU.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_DO.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_EC.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_ES.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_GT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_HN.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_MX.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_NI.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_PY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_SV.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_US.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_UY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/CurrencyNames_es_VE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/es/LocaleNames_es_US.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/et/CurrencyNames_et_EE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/fi/CurrencyNames_fi_FI.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CalendarData_fr_CA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_BE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_CA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_CH.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_FR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/CurrencyNames_fr_LU.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ga/CurrencyNames_ga_IE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/hi/CurrencyNames_hi_IN.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/hr/CurrencyNames_hr_HR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/hu/CurrencyNames_hu_HU.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/in/CalendarData_in_ID.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/in/CurrencyNames_in_ID.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/is/CurrencyNames_is_IS.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CurrencyNames_it_CH.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/it/CurrencyNames_it_IT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/iw/CurrencyNames_iw_IL.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/CurrencyNames_ja_JP.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/CurrencyNames_ko_KR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/mk/CurrencyNames_mk_MK.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ms/CalendarData_ms_MY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ms/CurrencyNames_ms_MY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/CalendarData_mt_MT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/mt/CurrencyNames_mt_MT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/CurrencyNames_nl_BE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/nl/CurrencyNames_nl_NL.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/no/CurrencyNames_no_NO.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/no/LocaleNames_no_NO_NY.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/pl/CurrencyNames_pl_PL.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CalendarData_pt_BR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CalendarData_pt_PT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CurrencyNames_pt_BR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/CurrencyNames_pt_PT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/LocaleNames_pt_BR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/LocaleNames_pt_PT.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java jdk/src/jdk.localedata/share/classes/sun/util/resources/ro/CurrencyNames_ro_RO.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/ru/CurrencyNames_ru_RU.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sk/CurrencyNames_sk_SK.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sl/CurrencyNames_sl_SI.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sq/CurrencyNames_sq_AL.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_BA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_ME.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CalendarData_sr_Latn_RS.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_BA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_CS.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_BA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_ME.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_Latn_RS.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_ME.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sr/CurrencyNames_sr_RS.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/CurrencyNames_sv_SE.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/th/CurrencyNames_th_TH.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/tr/CurrencyNames_tr_TR.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/uk/CurrencyNames_uk_UA.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/vi/CurrencyNames_vi_VN.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_CN.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_HK.java jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_SG.java jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CurrencyNames_zh_TW.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_HK.java jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_SG.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/LocaleNames_zh_TW.properties jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_HK.java jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java jdk/test/java/util/stream/boottest/java/util/stream/UnorderedTest.java jdk/test/javax/xml/ws/8046817/GenerateEnumSchema.java jdk/test/javax/xml/ws/8046817/TestClassType.java jdk/test/javax/xml/ws/8046817/TestEnumType.java jdk/test/sun/security/pkcs11/KeyStore/ProviderLoader.java
diffstat 2075 files changed, 854521 insertions(+), 413250 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags-top-repo	Sun Jun 28 16:38:48 2015 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 20:39:35 2017 +0200
@@ -312,3 +312,4 @@
 f546760134eb861fcfecd4ce611b0040b0d25a6a jdk9-b67
 70e4272790b6199e9ca89df2758ff9cb58ec4125 jdk9-b68
 1bcfd6b8726582cff5a42dbfc75903e36f9dd4fe jdk9-b69
+eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70
--- a/corba/.hgtags	Sun Jun 28 16:38:48 2015 -0700
+++ b/corba/.hgtags	Wed Jul 05 20:39:35 2017 +0200
@@ -312,3 +312,4 @@
 4418697e56f1f43597f55c7cb6573549c6117868 jdk9-b67
 8efad64f40eb8cd4df376c0a5275892eeb396bbd jdk9-b68
 de8acedcb5b5870f1dc54cba575aaa5d33897ea2 jdk9-b69
+e7cf01990ed366bd493080663259281e91ce223b jdk9-b70
--- a/hotspot/.hgtags	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 20:39:35 2017 +0200
@@ -472,3 +472,4 @@
 d47dfabd16d48eb96a451edd1b61194a39ee0eb5 jdk9-b67
 11af3990d56c97b40318bc1f20608e86f051a3f7 jdk9-b68
 ff0929a59ced0e144201aa05819ae2e47d6f2c61 jdk9-b69
+8672e9264db30c21504063932dbc374eabc287a1 jdk9-b70
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Wed Jul 05 20:39:35 2017 +0200
@@ -121,6 +121,8 @@
   private Flag[] commandLineFlags;
   private Map flagsMap;
 
+  private static Type intType;
+  private static Type uintType;
   private static Type intxType;
   private static Type uintxType;
   private static Type sizetType;
@@ -170,6 +172,28 @@
         return addr.getCIntegerAt(0, boolType.getSize(), boolType.isUnsigned()) != 0;
      }
 
+     public boolean isInt() {
+        return type.equals("int");
+     }
+
+     public long getInt() {
+        if (Assert.ASSERTS_ENABLED) {
+           Assert.that(isInt(), "not an int flag!");
+        }
+        return addr.getCIntegerAt(0, intType.getSize(), false);
+     }
+
+     public boolean isUInt() {
+        return type.equals("uint");
+     }
+
+     public long getUInt() {
+        if (Assert.ASSERTS_ENABLED) {
+           Assert.that(isUInt(), "not a uint flag!");
+        }
+        return addr.getCIntegerAt(0, uintType.getSize(), false);
+     }
+
      public boolean isIntx() {
         return type.equals("intx");
      }
@@ -206,6 +230,10 @@
      public String getValue() {
         if (isBool()) {
            return new Boolean(getBool()).toString();
+        } else if (isInt()) {
+           return new Long(getInt()).toString();
+        } else if (isUInt()) {
+           return new Long(getUInt()).toString();
         } else if (isIntx()) {
            return new Long(getIntx()).toString();
         } else if (isUIntx()) {
@@ -334,6 +362,8 @@
     heapWordSize = db.lookupIntConstant("HeapWordSize").intValue();
     oopSize  = db.lookupIntConstant("oopSize").intValue();
 
+    intType = db.lookupType("int");
+    uintType = db.lookupType("uint");
     intxType = db.lookupType("intx");
     uintxType = db.lookupType("uintx");
     sizetType = db.lookupType("size_t");
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad	Wed Jul 05 20:39:35 2017 +0200
@@ -13276,7 +13276,7 @@
   ins_cost(INSN_COST);
   format %{ "movi  $dst, $con\t# vector(16B)" %}
   ins_encode %{
-    __ mov(as_FloatRegister($dst$$reg), __ T16B, $con$$constant);
+    __ mov(as_FloatRegister($dst$$reg), __ T16B, $con$$constant & 0xff);
   %}
   ins_pipe(pipe_class_default);
 %}
@@ -13298,7 +13298,7 @@
   ins_cost(INSN_COST);
   format %{ "movi  $dst, $con\t# vector(8H)" %}
   ins_encode %{
-    __ mov(as_FloatRegister($dst$$reg), __ T8H, $con$$constant);
+    __ mov(as_FloatRegister($dst$$reg), __ T8H, $con$$constant & 0xffff);
   %}
   ins_pipe(pipe_class_default);
 %}
--- a/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -491,6 +491,11 @@
         i->rf(_index, 16);
         i->f(_ext.option(), 15, 13);
         unsigned size = i->get(31, 30);
+        if (i->get(26, 26) && i->get(23, 23)) {
+          // SIMD Q Type - Size = 128 bits
+          assert(size == 0, "bad size");
+          size = 0b100;
+        }
         if (size == 0) // It's a byte
           i->f(_ext.shift() >= 0, 12);
         else {
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -1408,6 +1408,52 @@
   movk(r, imm64 & 0xffff, 32);
 }
 
+// Macro to mov replicated immediate to vector register.
+//  Vd will get the following values for different arrangements in T
+//   imm32 == hex 000000gh  T8B:  Vd = ghghghghghghghgh
+//   imm32 == hex 000000gh  T16B: Vd = ghghghghghghghghghghghghghghghgh
+//   imm32 == hex 0000efgh  T4H:  Vd = efghefghefghefgh
+//   imm32 == hex 0000efgh  T8H:  Vd = efghefghefghefghefghefghefghefgh
+//   imm32 == hex abcdefgh  T2S:  Vd = abcdefghabcdefgh
+//   imm32 == hex abcdefgh  T4S:  Vd = abcdefghabcdefghabcdefghabcdefgh
+//   T1D/T2D: invalid
+void MacroAssembler::mov(FloatRegister Vd, SIMD_Arrangement T, u_int32_t imm32) {
+  assert(T != T1D && T != T2D, "invalid arrangement");
+  if (T == T8B || T == T16B) {
+    assert((imm32 & ~0xff) == 0, "extraneous bits in unsigned imm32 (T8B/T16B)");
+    movi(Vd, T, imm32 & 0xff, 0);
+    return;
+  }
+  u_int32_t nimm32 = ~imm32;
+  if (T == T4H || T == T8H) {
+    assert((imm32  & ~0xffff) == 0, "extraneous bits in unsigned imm32 (T4H/T8H)");
+    imm32 &= 0xffff;
+    nimm32 &= 0xffff;
+  }
+  u_int32_t x = imm32;
+  int movi_cnt = 0;
+  int movn_cnt = 0;
+  while (x) { if (x & 0xff) movi_cnt++; x >>= 8; }
+  x = nimm32;
+  while (x) { if (x & 0xff) movn_cnt++; x >>= 8; }
+  if (movn_cnt < movi_cnt) imm32 = nimm32;
+  unsigned lsl = 0;
+  while (imm32 && (imm32 & 0xff) == 0) { lsl += 8; imm32 >>= 8; }
+  if (movn_cnt < movi_cnt)
+    mvni(Vd, T, imm32 & 0xff, lsl);
+  else
+    movi(Vd, T, imm32 & 0xff, lsl);
+  imm32 >>= 8; lsl += 8;
+  while (imm32) {
+    while ((imm32 & 0xff) == 0) { lsl += 8; imm32 >>= 8; }
+    if (movn_cnt < movi_cnt)
+      bici(Vd, T, imm32 & 0xff, lsl);
+    else
+      orri(Vd, T, imm32 & 0xff, lsl);
+    lsl += 8; imm32 >>= 8;
+  }
+}
+
 void MacroAssembler::mov_immediate64(Register dst, u_int64_t imm64)
 {
 #ifndef PRODUCT
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -465,44 +465,7 @@
 
   void movptr(Register r, uintptr_t imm64);
 
-  // Macro to mov replicated immediate to vector register.
-  // Where imm32 == hex abcdefgh, Vd will get the following values
-  // for different arrangements in T
-  //   T8B:  Vd = ghghghghghghghgh
-  //   T16B: Vd = ghghghghghghghghghghghghghghghgh
-  //   T4H:  Vd = efghefghefghefgh
-  //   T8H:  Vd = efghefghefghefghefghefghefghefgh
-  //   T2S:  Vd = abcdefghabcdefgh
-  //   T4S:  Vd = abcdefghabcdefghabcdefghabcdefgh
-  //   T1D/T2D: invalid
-  void mov(FloatRegister Vd, SIMD_Arrangement T, u_int32_t imm32) {
-    assert(T != T1D && T != T2D, "invalid arrangement");
-    u_int32_t nimm32 = ~imm32;
-    if (T == T8B || T == T16B) { imm32 &= 0xff; nimm32 &= 0xff; }
-    if (T == T4H || T == T8H) { imm32 &= 0xffff; nimm32 &= 0xffff; }
-    u_int32_t x = imm32;
-    int movi_cnt = 0;
-    int movn_cnt = 0;
-    while (x) { if (x & 0xff) movi_cnt++; x >>= 8; }
-    x = nimm32;
-    while (x) { if (x & 0xff) movn_cnt++; x >>= 8; }
-    if (movn_cnt < movi_cnt) imm32 = nimm32;
-    unsigned lsl = 0;
-    while (imm32 && (imm32 & 0xff) == 0) { lsl += 8; imm32 >>= 8; }
-    if (movn_cnt < movi_cnt)
-      mvni(Vd, T, imm32 & 0xff, lsl);
-    else
-      movi(Vd, T, imm32 & 0xff, lsl);
-    imm32 >>= 8; lsl += 8;
-    while (imm32) {
-      while ((imm32 & 0xff) == 0) { lsl += 8; imm32 >>= 8; }
-      if (movn_cnt < movi_cnt)
-        bici(Vd, T, imm32 & 0xff, lsl);
-      else
-        orri(Vd, T, imm32 & 0xff, lsl);
-      lsl += 8; imm32 >>= 8;
-    }
-  }
+  void mov(FloatRegister Vd, SIMD_Arrangement T, u_int32_t imm32);
 
   // macro instructions for accessing and updating floating point
   // status register
--- a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -228,6 +228,9 @@
       warning("SHA512 instruction (for SHA-384 and SHA-512) is not available on this CPU.");
       FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
     }
+    if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
+      FLAG_SET_DEFAULT(UseSHA, false);
+    }
   }
 
   // This machine allows unaligned memory accesses
--- a/hotspot/src/share/vm/ci/ciMethod.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/ci/ciMethod.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -71,8 +71,7 @@
 // Loaded method.
 ciMethod::ciMethod(methodHandle h_m, ciInstanceKlass* holder) :
   ciMetadata(h_m()),
-  _holder(holder),
-  _has_injected_profile(false)
+  _holder(holder)
 {
   assert(h_m() != NULL, "no null method");
 
@@ -170,8 +169,7 @@
   _liveness(               NULL),
   _can_be_statically_bound(false),
   _method_blocks(          NULL),
-  _method_data(            NULL),
-  _has_injected_profile(   false)
+  _method_data(            NULL)
 #if defined(COMPILER2) || defined(SHARK)
   ,
   _flow(                   NULL),
--- a/hotspot/src/share/vm/ci/ciMethod.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/ci/ciMethod.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -81,7 +81,6 @@
   bool _is_c1_compilable;
   bool _is_c2_compilable;
   bool _can_be_statically_bound;
-  bool _has_injected_profile;
 
   // Lazy fields, filled in on demand
   address              _code;
@@ -179,9 +178,9 @@
   // Code size for inlining decisions.
   int code_size_for_inlining();
 
-  bool caller_sensitive() { return get_Method()->caller_sensitive(); }
-  bool force_inline()     { return get_Method()->force_inline();     }
-  bool dont_inline()      { return get_Method()->dont_inline();      }
+  bool caller_sensitive()   const { return get_Method()->caller_sensitive();   }
+  bool force_inline()       const { return get_Method()->force_inline();       }
+  bool dont_inline()        const { return get_Method()->dont_inline();        }
 
   int comp_level();
   int highest_osr_comp_level();
@@ -289,9 +288,6 @@
   int instructions_size();
   int scale_count(int count, float prof_factor = 1.);  // make MDO count commensurate with IIC
 
-  bool has_injected_profile() const { return _has_injected_profile;     }
-  void set_injected_profile(bool x) {        _has_injected_profile = x; }
-
   // Stack walking support
   bool is_ignored_by_security_stack_walk() const;
 
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -1742,6 +1742,10 @@
     if (_location != _in_method)  break;  // only allow for methods
     if (!privileged)              break;  // only allow in privileged code
     return _method_DontInline;
+  case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_InjectedProfile_signature):
+    if (_location != _in_method)  break;  // only allow for methods
+    if (!privileged)              break;  // only allow in privileged code
+    return _method_InjectedProfile;
   case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature):
     if (_location != _in_method)  break;  // only allow for methods
     if (!privileged)              break;  // only allow in privileged code
@@ -1783,6 +1787,8 @@
     m->set_force_inline(true);
   if (has_annotation(_method_DontInline))
     m->set_dont_inline(true);
+  if (has_annotation(_method_InjectedProfile))
+    m->set_has_injected_profile(true);
   if (has_annotation(_method_LambdaForm_Compiled) && m->intrinsic_id() == vmIntrinsics::_none)
     m->set_intrinsic_id(vmIntrinsics::_compiledLambdaForm);
   if (has_annotation(_method_LambdaForm_Hidden))
--- a/hotspot/src/share/vm/classfile/classFileParser.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/classfile/classFileParser.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -127,6 +127,7 @@
       _method_CallerSensitive,
       _method_ForceInline,
       _method_DontInline,
+      _method_InjectedProfile,
       _method_LambdaForm_Compiled,
       _method_LambdaForm_Hidden,
       _sun_misc_Contended,
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -278,6 +278,7 @@
   template(java_lang_invoke_LambdaForm,               "java/lang/invoke/LambdaForm")              \
   template(java_lang_invoke_ForceInline_signature,    "Ljava/lang/invoke/ForceInline;")           \
   template(java_lang_invoke_DontInline_signature,     "Ljava/lang/invoke/DontInline;")            \
+  template(java_lang_invoke_InjectedProfile_signature, "Ljava/lang/invoke/InjectedProfile;")      \
   template(java_lang_invoke_Stable_signature,         "Ljava/lang/invoke/Stable;")                \
   template(java_lang_invoke_LambdaForm_Compiled_signature, "Ljava/lang/invoke/LambdaForm$Compiled;") \
   template(java_lang_invoke_LambdaForm_Hidden_signature, "Ljava/lang/invoke/LambdaForm$Hidden;")  \
--- a/hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -96,7 +96,7 @@
     heap->collector_policy()->should_clear_all_soft_refs();
 
   uint count = maximum_heap_compaction ? 1 : MarkSweepAlwaysCompactCount;
-  UIntFlagSetting flag_setting(MarkSweepAlwaysCompactCount, count);
+  UIntXFlagSetting flag_setting(MarkSweepAlwaysCompactCount, count);
   PSMarkSweep::invoke_no_policy(clear_all_soft_refs || maximum_heap_compaction);
 }
 
--- a/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/gc/shared/collectorPolicy.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -785,7 +785,7 @@
   // free memory should be here, especially if they are expensive. If this
   // attempt fails, an OOM exception will be thrown.
   {
-    UIntFlagSetting flag_change(MarkSweepAlwaysCompactCount, 1); // Make sure the heap is fully compacted
+    UIntXFlagSetting flag_change(MarkSweepAlwaysCompactCount, 1); // Make sure the heap is fully compacted
 
     gch->do_collection(true             /* full */,
                        true             /* clear_all_soft_refs */,
--- a/hotspot/src/share/vm/oops/method.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/oops/method.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -93,6 +93,7 @@
   set_force_inline(false);
   set_hidden(false);
   set_dont_inline(false);
+  set_has_injected_profile(false);
   set_method_data(NULL);
   clear_method_counters();
   set_vtable_index(Method::garbage_vtable_index);
--- a/hotspot/src/share/vm/oops/method.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/oops/method.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -76,12 +76,13 @@
 
   // Flags
   enum Flags {
-    _jfr_towrite      = 1 << 0,
-    _caller_sensitive = 1 << 1,
-    _force_inline     = 1 << 2,
-    _dont_inline      = 1 << 3,
-    _hidden           = 1 << 4,
-    _running_emcp     = 1 << 5
+    _jfr_towrite          = 1 << 0,
+    _caller_sensitive     = 1 << 1,
+    _force_inline         = 1 << 2,
+    _dont_inline          = 1 << 3,
+    _hidden               = 1 << 4,
+    _has_injected_profile = 1 << 5,
+    _running_emcp         = 1 << 6
   };
   u1 _flags;
 
@@ -814,6 +815,13 @@
     _flags = x ? (_flags | _hidden) : (_flags & ~_hidden);
   }
 
+  bool has_injected_profile() {
+    return (_flags & _has_injected_profile) != 0;
+  }
+  void set_has_injected_profile(bool x) {
+    _flags = x ? (_flags | _has_injected_profile) : (_flags & ~_has_injected_profile);
+  }
+
   ConstMethod::MethodType method_type() const {
       return _constMethod->method_type();
   }
--- a/hotspot/src/share/vm/opto/arraycopynode.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/opto/arraycopynode.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -438,11 +438,17 @@
       // replace fallthrough projections of the ArrayCopyNode by the
       // new memory, control and the input IO.
       CallProjections callprojs;
-      extract_projections(&callprojs, true);
+      extract_projections(&callprojs, true, false);
 
-      igvn->replace_node(callprojs.fallthrough_ioproj, in(TypeFunc::I_O));
-      igvn->replace_node(callprojs.fallthrough_memproj, mem);
-      igvn->replace_node(callprojs.fallthrough_catchproj, ctl);
+      if (callprojs.fallthrough_ioproj != NULL) {
+        igvn->replace_node(callprojs.fallthrough_ioproj, in(TypeFunc::I_O));
+      }
+      if (callprojs.fallthrough_memproj != NULL) {
+        igvn->replace_node(callprojs.fallthrough_memproj, mem);
+      }
+      if (callprojs.fallthrough_catchproj != NULL) {
+        igvn->replace_node(callprojs.fallthrough_catchproj, ctl);
+      }
 
       // The ArrayCopyNode is not disconnected. It still has the
       // projections for the exception case. Replace current
--- a/hotspot/src/share/vm/opto/callnode.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/opto/callnode.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -724,6 +724,26 @@
 //
 bool CallNode::may_modify(const TypeOopPtr *t_oop, PhaseTransform *phase) {
   assert((t_oop != NULL), "sanity");
+  if (is_call_to_arraycopystub()) {
+    const TypeTuple* args = _tf->domain();
+    Node* dest = NULL;
+    // Stubs that can be called once an ArrayCopyNode is expanded have
+    // different signatures. Look for the second pointer argument,
+    // that is the destination of the copy.
+    for (uint i = TypeFunc::Parms, j = 0; i < args->cnt(); i++) {
+      if (args->field_at(i)->isa_ptr()) {
+        j++;
+        if (j == 2) {
+          dest = in(i);
+          break;
+        }
+      }
+    }
+    if (!dest->is_top() && may_modify_arraycopy_helper(phase->type(dest)->is_oopptr(), t_oop, phase)) {
+      return true;
+    }
+    return false;
+  }
   if (t_oop->is_known_instance()) {
     // The instance_id is set only for scalar-replaceable allocations which
     // are not passed as arguments according to Escape Analysis.
@@ -810,7 +830,7 @@
 }
 
 
-void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj) {
+void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts) {
   projs->fallthrough_proj      = NULL;
   projs->fallthrough_catchproj = NULL;
   projs->fallthrough_ioproj    = NULL;
@@ -873,17 +893,18 @@
     }
   }
 
-  // The resproj may not exist because the result couuld be ignored
+  // The resproj may not exist because the result could be ignored
   // and the exception object may not exist if an exception handler
   // swallows the exception but all the other must exist and be found.
   assert(projs->fallthrough_proj      != NULL, "must be found");
-  assert(Compile::current()->inlining_incrementally() || projs->fallthrough_catchproj != NULL, "must be found");
-  assert(Compile::current()->inlining_incrementally() || projs->fallthrough_memproj   != NULL, "must be found");
-  assert(Compile::current()->inlining_incrementally() || projs->fallthrough_ioproj    != NULL, "must be found");
-  assert(Compile::current()->inlining_incrementally() || projs->catchall_catchproj    != NULL, "must be found");
+  do_asserts = do_asserts && !Compile::current()->inlining_incrementally();
+  assert(!do_asserts || projs->fallthrough_catchproj != NULL, "must be found");
+  assert(!do_asserts || projs->fallthrough_memproj   != NULL, "must be found");
+  assert(!do_asserts || projs->fallthrough_ioproj    != NULL, "must be found");
+  assert(!do_asserts || projs->catchall_catchproj    != NULL, "must be found");
   if (separate_io_proj) {
-    assert(Compile::current()->inlining_incrementally() || projs->catchall_memproj    != NULL, "must be found");
-    assert(Compile::current()->inlining_incrementally() || projs->catchall_ioproj     != NULL, "must be found");
+    assert(!do_asserts || projs->catchall_memproj    != NULL, "must be found");
+    assert(!do_asserts || projs->catchall_ioproj     != NULL, "must be found");
   }
 }
 
@@ -909,6 +930,12 @@
   return SafePointNode::Ideal(phase, can_reshape);
 }
 
+bool CallNode::is_call_to_arraycopystub() const {
+  if (_name != NULL && strstr(_name, "arraycopy") != 0) {
+    return true;
+  }
+  return false;
+}
 
 //=============================================================================
 uint CallJavaNode::size_of() const { return sizeof(*this); }
@@ -1007,14 +1034,6 @@
 
 
 //=============================================================================
-bool CallLeafNode::is_call_to_arraycopystub() const {
-  if (_name != NULL && strstr(_name, "arraycopy") != 0) {
-    return true;
-  }
-  return false;
-}
-
-
 #ifndef PRODUCT
 void CallLeafNode::dump_spec(outputStream *st) const {
   st->print("# ");
@@ -1930,26 +1949,3 @@
   return true;
 }
 
-bool CallLeafNode::may_modify(const TypeOopPtr *t_oop, PhaseTransform *phase) {
-  if (is_call_to_arraycopystub()) {
-    const TypeTuple* args = _tf->domain();
-    Node* dest = NULL;
-    // Stubs that can be called once an ArrayCopyNode is expanded have
-    // different signatures. Look for the second pointer argument,
-    // that is the destination of the copy.
-    for (uint i = TypeFunc::Parms, j = 0; i < args->cnt(); i++) {
-      if (args->field_at(i)->isa_ptr()) {
-        j++;
-        if (j == 2) {
-          dest = in(i);
-          break;
-        }
-      }
-    }
-    if (!dest->is_top() && may_modify_arraycopy_helper(phase->type(dest)->is_oopptr(), t_oop, phase)) {
-      return true;
-    }
-    return false;
-  }
-  return CallNode::may_modify(t_oop, phase);
-}
--- a/hotspot/src/share/vm/opto/callnode.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/opto/callnode.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -565,13 +565,15 @@
   address      _entry_point;  // Address of method being called
   float        _cnt;          // Estimate of number of times called
   CallGenerator* _generator;  // corresponding CallGenerator for some late inline calls
+  const char *_name;           // Printable name, if _method is NULL
 
   CallNode(const TypeFunc* tf, address addr, const TypePtr* adr_type)
     : SafePointNode(tf->domain()->cnt(), NULL, adr_type),
       _tf(tf),
       _entry_point(addr),
       _cnt(COUNT_UNKNOWN),
-      _generator(NULL)
+      _generator(NULL),
+      _name(NULL)
   {
     init_class_id(Class_Call);
   }
@@ -626,10 +628,12 @@
   // Collect all the interesting edges from a call for use in
   // replacing the call by something else.  Used by macro expansion
   // and the late inlining support.
-  void extract_projections(CallProjections* projs, bool separate_io_proj);
+  void extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts = true);
 
   virtual uint match_edge(uint idx) const;
 
+  bool is_call_to_arraycopystub() const;
+
 #ifndef PRODUCT
   virtual void        dump_req(outputStream *st = tty) const;
   virtual void        dump_spec(outputStream *st) const;
@@ -683,7 +687,7 @@
   virtual uint size_of() const; // Size is bigger
 public:
   CallStaticJavaNode(Compile* C, const TypeFunc* tf, address addr, ciMethod* method, int bci)
-    : CallJavaNode(tf, addr, method, bci), _name(NULL) {
+    : CallJavaNode(tf, addr, method, bci) {
     init_class_id(Class_CallStaticJava);
     if (C->eliminate_boxing() && (method != NULL) && method->is_boxing_method()) {
       init_flags(Flag_is_macro);
@@ -694,14 +698,14 @@
   }
   CallStaticJavaNode(const TypeFunc* tf, address addr, const char* name, int bci,
                      const TypePtr* adr_type)
-    : CallJavaNode(tf, addr, NULL, bci), _name(name) {
+    : CallJavaNode(tf, addr, NULL, bci) {
     init_class_id(Class_CallStaticJava);
     // This node calls a runtime stub, which often has narrow memory effects.
     _adr_type = adr_type;
     _is_scalar_replaceable = false;
     _is_non_escaping = false;
+    _name = name;
   }
-  const char *_name;      // Runtime wrapper name
 
   // Result of Escape Analysis
   bool _is_scalar_replaceable;
@@ -754,13 +758,12 @@
 public:
   CallRuntimeNode(const TypeFunc* tf, address addr, const char* name,
                   const TypePtr* adr_type)
-    : CallNode(tf, addr, adr_type),
-      _name(name)
+    : CallNode(tf, addr, adr_type)
   {
     init_class_id(Class_CallRuntime);
+    _name = name;
   }
 
-  const char *_name;            // Printable name, if _method is NULL
   virtual int   Opcode() const;
   virtual void  calling_convention( BasicType* sig_bt, VMRegPair *parm_regs, uint argcnt ) const;
 
@@ -785,8 +788,6 @@
 #ifndef PRODUCT
   virtual void  dump_spec(outputStream *st) const;
 #endif
-  bool is_call_to_arraycopystub() const;
-  virtual bool may_modify(const TypeOopPtr *t_oop, PhaseTransform *phase);
 };
 
 //------------------------------CallLeafNoFPNode-------------------------------
--- a/hotspot/src/share/vm/opto/compile.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/opto/compile.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -3390,9 +3390,6 @@
 bool Compile::too_many_traps(ciMethod* method,
                              int bci,
                              Deoptimization::DeoptReason reason) {
-  if (method->has_injected_profile()) {
-    return false;
-  }
   ciMethodData* md = method->method_data();
   if (md->is_empty()) {
     // Assume the trap has not occurred, or that it occurred only
@@ -3442,9 +3439,6 @@
 bool Compile::too_many_recompiles(ciMethod* method,
                                   int bci,
                                   Deoptimization::DeoptReason reason) {
-  if (method->has_injected_profile()) {
-    return false;
-  }
   ciMethodData* md = method->method_data();
   if (md->is_empty()) {
     // Assume the trap has not occurred, or that it occurred only
--- a/hotspot/src/share/vm/opto/library_call.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -6125,8 +6125,6 @@
     jint false_cnt = aobj->element_value(0).as_int();
     jint  true_cnt = aobj->element_value(1).as_int();
 
-    method()->set_injected_profile(true);
-
     if (C->log() != NULL) {
       C->log()->elem("observe source='profileBoolean' false='%d' true='%d'",
                      false_cnt, true_cnt);
--- a/hotspot/src/share/vm/opto/memnode.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/opto/memnode.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -108,11 +108,10 @@
 
 #endif
 
-static bool membar_for_arraycopy_helper(const TypeOopPtr *t_oop, MergeMemNode* mm, PhaseTransform *phase) {
-  if (mm->memory_at(Compile::AliasIdxRaw)->is_Proj()) {
-    Node* n = mm->memory_at(Compile::AliasIdxRaw)->in(0);
-    if ((n->is_ArrayCopy() && n->as_ArrayCopy()->may_modify(t_oop, phase)) ||
-        (n->is_CallLeaf() && n->as_CallLeaf()->may_modify(t_oop, phase))) {
+static bool membar_for_arraycopy_helper(const TypeOopPtr *t_oop, Node* n, PhaseTransform *phase) {
+  if (n->is_Proj()) {
+    n = n->in(0);
+    if (n->is_Call() && n->as_Call()->may_modify(t_oop, phase)) {
       return true;
     }
   }
@@ -121,16 +120,22 @@
 
 static bool membar_for_arraycopy(const TypeOopPtr *t_oop, MemBarNode* mb, PhaseTransform *phase) {
   Node* mem = mb->in(TypeFunc::Memory);
+
   if (mem->is_MergeMem()) {
-    return membar_for_arraycopy_helper(t_oop, mem->as_MergeMem(), phase);
-  } else if (mem->is_Phi()) {
-    // after macro expansion of an ArrayCopyNode we may have a Phi
-    for (uint i = 1; i < mem->req(); i++) {
-      if (mem->in(i) != NULL && mem->in(i)->is_MergeMem() && membar_for_arraycopy_helper(t_oop, mem->in(i)->as_MergeMem(), phase)) {
-        return true;
+    Node* n = mem->as_MergeMem()->memory_at(Compile::AliasIdxRaw);
+    if (membar_for_arraycopy_helper(t_oop, n, phase)) {
+      return true;
+    } else if (n->is_Phi()) {
+      for (uint i = 1; i < n->req(); i++) {
+        if (n->in(i) != NULL) {
+          if (membar_for_arraycopy_helper(t_oop, n->in(i), phase)) {
+            return true;
+          }
+        }
       }
     }
   }
+
   return false;
 }
 
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -43,6 +43,7 @@
 #include "runtime/deoptimization.hpp"
 #include "runtime/relocator.hpp"
 #include "utilities/bitMap.inline.hpp"
+#include "utilities/events.hpp"
 
 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
 
@@ -174,6 +175,9 @@
   // Free os::malloc allocated memory.
   os::free(_scratch_classes);
 
+  // Reset the_class_oop to null for error printing.
+  _the_class_oop = NULL;
+
   if (RC_TRACE_ENABLED(0x00000004)) {
     // Used to have separate timers for "doit" and "all", but the timer
     // overhead skewed the measurements.
@@ -4105,6 +4109,13 @@
     java_lang_Class::classRedefinedCount(the_class_mirror),
     os::available_memory() >> 10));
 
+  {
+    ResourceMark rm(THREAD);
+    Events::log_redefinition(THREAD, "redefined class name=%s, count=%d",
+                             the_class->external_name(),
+                             java_lang_Class::classRedefinedCount(the_class_mirror));
+
+  }
   RC_TIMER_STOP(_timer_rsc_phase2);
 } // end redefine_single_class()
 
@@ -4249,3 +4260,11 @@
     tty->cr();
   }
 }
+
+void VM_RedefineClasses::print_on_error(outputStream* st) const {
+  VM_Operation::print_on_error(st);
+  if (_the_class_oop != NULL) {
+    ResourceMark rm;
+    st->print_cr(", redefining class %s", _the_class_oop->external_name());
+  }
+}
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -539,5 +539,8 @@
   static unsigned char * get_cached_class_file_bytes(JvmtiCachedClassFileData *cache) {
     return cache == NULL ? NULL : cache->data;
   }
+
+  // Error printing
+  void print_on_error(outputStream* st) const;
 };
 #endif // SHARE_VM_PRIMS_JVMTIREDEFINECLASSES_HPP
--- a/hotspot/src/share/vm/prims/whitebox.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/prims/whitebox.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -710,6 +710,24 @@
   return NULL;
 WB_END
 
+WB_ENTRY(jobject, WB_GetIntVMFlag(JNIEnv* env, jobject o, jstring name))
+  int result;
+  if (GetVMFlag <int> (thread, env, name, &result, &CommandLineFlags::intAt)) {
+    ThreadToNativeFromVM ttnfv(thread);   // can't be in VM when we call JNI
+    return longBox(thread, env, result);
+  }
+  return NULL;
+WB_END
+
+WB_ENTRY(jobject, WB_GetUintVMFlag(JNIEnv* env, jobject o, jstring name))
+  uint result;
+  if (GetVMFlag <uint> (thread, env, name, &result, &CommandLineFlags::uintAt)) {
+    ThreadToNativeFromVM ttnfv(thread);   // can't be in VM when we call JNI
+    return longBox(thread, env, result);
+  }
+  return NULL;
+WB_END
+
 WB_ENTRY(jobject, WB_GetIntxVMFlag(JNIEnv* env, jobject o, jstring name))
   intx result;
   if (GetVMFlag <intx> (thread, env, name, &result, &CommandLineFlags::intxAt)) {
@@ -771,6 +789,16 @@
   SetVMFlag <bool> (thread, env, name, &result, &CommandLineFlags::boolAtPut);
 WB_END
 
+WB_ENTRY(void, WB_SetIntVMFlag(JNIEnv* env, jobject o, jstring name, jlong value))
+  int result = value;
+  SetVMFlag <int> (thread, env, name, &result, &CommandLineFlags::intAtPut);
+WB_END
+
+WB_ENTRY(void, WB_SetUintVMFlag(JNIEnv* env, jobject o, jstring name, jlong value))
+  uint result = value;
+  SetVMFlag <uint> (thread, env, name, &result, &CommandLineFlags::uintAtPut);
+WB_END
+
 WB_ENTRY(void, WB_SetIntxVMFlag(JNIEnv* env, jobject o, jstring name, jlong value))
   intx result = value;
   SetVMFlag <intx> (thread, env, name, &result, &CommandLineFlags::intxAtPut);
@@ -1336,6 +1364,8 @@
   {CC"isConstantVMFlag",   CC"(Ljava/lang/String;)Z", (void*)&WB_IsConstantVMFlag},
   {CC"isLockedVMFlag",     CC"(Ljava/lang/String;)Z", (void*)&WB_IsLockedVMFlag},
   {CC"setBooleanVMFlag",   CC"(Ljava/lang/String;Z)V",(void*)&WB_SetBooleanVMFlag},
+  {CC"setIntVMFlag",       CC"(Ljava/lang/String;J)V",(void*)&WB_SetIntVMFlag},
+  {CC"setUintVMFlag",      CC"(Ljava/lang/String;J)V",(void*)&WB_SetUintVMFlag},
   {CC"setIntxVMFlag",      CC"(Ljava/lang/String;J)V",(void*)&WB_SetIntxVMFlag},
   {CC"setUintxVMFlag",     CC"(Ljava/lang/String;J)V",(void*)&WB_SetUintxVMFlag},
   {CC"setUint64VMFlag",    CC"(Ljava/lang/String;J)V",(void*)&WB_SetUint64VMFlag},
@@ -1345,6 +1375,10 @@
                                                       (void*)&WB_SetStringVMFlag},
   {CC"getBooleanVMFlag",   CC"(Ljava/lang/String;)Ljava/lang/Boolean;",
                                                       (void*)&WB_GetBooleanVMFlag},
+  {CC"getIntVMFlag",       CC"(Ljava/lang/String;)Ljava/lang/Long;",
+                                                      (void*)&WB_GetIntVMFlag},
+  {CC"getUintVMFlag",      CC"(Ljava/lang/String;)Ljava/lang/Long;",
+                                                      (void*)&WB_GetUintVMFlag},
   {CC"getIntxVMFlag",      CC"(Ljava/lang/String;)Ljava/lang/Long;",
                                                       (void*)&WB_GetIntxVMFlag},
   {CC"getUintxVMFlag",     CC"(Ljava/lang/String;)Ljava/lang/Long;",
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -586,11 +586,12 @@
 
 static bool set_numeric_flag(char* name, char* value, Flag::Flags origin) {
   julong v;
+  int int_v;
   intx intx_v;
   bool is_neg = false;
   // Check the sign first since atomull() parses only unsigned values.
   if (*value == '-') {
-    if (!CommandLineFlags::intxAt(name, &intx_v)) {
+    if (!CommandLineFlags::intxAt(name, &intx_v) && !CommandLineFlags::intAt(name, &int_v)) {
       return false;
     }
     value++;
@@ -599,6 +600,17 @@
   if (!atomull(value, &v)) {
     return false;
   }
+  int_v = (int) v;
+  if (is_neg) {
+    int_v = -int_v;
+  }
+  if (CommandLineFlags::intAtPut(name, &int_v, origin)) {
+    return true;
+  }
+  uint uint_v = (uint) v;
+  if (!is_neg && CommandLineFlags::uintAtPut(name, &uint_v, origin)) {
+    return true;
+  }
   intx_v = (intx) v;
   if (is_neg) {
     intx_v = -intx_v;
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -1460,7 +1460,11 @@
     //
     // The other actions cause immediate removal of the present code.
 
-    bool update_trap_state = (reason != Reason_tenured);
+    // Traps caused by injected profile shouldn't pollute trap counts.
+    bool injected_profile_trap = trap_method->has_injected_profile() &&
+                                 (reason == Reason_intrinsic || reason == Reason_unreached);
+
+    bool update_trap_state = (reason != Reason_tenured) && !injected_profile_trap;
     bool make_not_entrant = false;
     bool make_not_compilable = false;
     bool reprofile = false;
--- a/hotspot/src/share/vm/runtime/globals.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/runtime/globals.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -93,6 +93,32 @@
   *((bool*) _addr) = value;
 }
 
+bool Flag::is_int() const {
+  return strcmp(_type, "int")  == 0;
+}
+
+int Flag::get_int() const {
+  return *((int*) _addr);
+}
+
+void Flag::set_int(int value) {
+  check_writable();
+  *((int*) _addr) = value;
+}
+
+bool Flag::is_uint() const {
+  return strcmp(_type, "uint")  == 0;
+}
+
+uint Flag::get_uint() const {
+  return *((uint*) _addr);
+}
+
+void Flag::set_uint(uint value) {
+  check_writable();
+  *((uint*) _addr) = value;
+}
+
 bool Flag::is_intx() const {
   return strcmp(_type, "intx")  == 0;
 }
@@ -316,6 +342,12 @@
   if (is_bool()) {
     st->print("%-16s", get_bool() ? "true" : "false");
   }
+  if (is_int()) {
+    st->print("%-16d", get_int());
+  }
+  if (is_uint()) {
+    st->print("%-16u", get_uint());
+  }
   if (is_intx()) {
     st->print("%-16ld", get_intx());
   }
@@ -411,6 +443,10 @@
 void Flag::print_as_flag(outputStream* st) {
   if (is_bool()) {
     st->print("-XX:%s%s", get_bool() ? "+" : "-", _name);
+  } else if (is_int()) {
+    st->print("-XX:%s=%d", _name, get_int());
+  } else if (is_uint()) {
+    st->print("-XX:%s=%u", _name, get_uint());
   } else if (is_intx()) {
     st->print("-XX:%s=" INTX_FORMAT, _name, get_intx());
   } else if (is_uintx()) {
@@ -663,6 +699,62 @@
   faddr->set_origin(origin);
 }
 
+bool CommandLineFlags::intAt(const char* name, size_t len, int* value, bool allow_locked, bool return_flag) {
+  Flag* result = Flag::find_flag(name, len, allow_locked, return_flag);
+  if (result == NULL) return false;
+  if (!result->is_int()) return false;
+  *value = result->get_int();
+  return true;
+}
+
+bool CommandLineFlags::intAtPut(const char* name, size_t len, int* value, Flag::Flags origin) {
+  Flag* result = Flag::find_flag(name, len);
+  if (result == NULL) return false;
+  if (!result->is_int()) return false;
+  int old_value = result->get_int();
+  trace_flag_changed<EventIntFlagChanged, s4>(name, old_value, *value, origin);
+  result->set_int(*value);
+  *value = old_value;
+  result->set_origin(origin);
+  return true;
+}
+
+void CommandLineFlagsEx::intAtPut(CommandLineFlagWithType flag, int value, Flag::Flags origin) {
+  Flag* faddr = address_of_flag(flag);
+  guarantee(faddr != NULL && faddr->is_int(), "wrong flag type");
+  trace_flag_changed<EventIntFlagChanged, s4>(faddr->_name, faddr->get_int(), value, origin);
+  faddr->set_int(value);
+  faddr->set_origin(origin);
+}
+
+bool CommandLineFlags::uintAt(const char* name, size_t len, uint* value, bool allow_locked, bool return_flag) {
+  Flag* result = Flag::find_flag(name, len, allow_locked, return_flag);
+  if (result == NULL) return false;
+  if (!result->is_uint()) return false;
+  *value = result->get_uint();
+  return true;
+}
+
+bool CommandLineFlags::uintAtPut(const char* name, size_t len, uint* value, Flag::Flags origin) {
+  Flag* result = Flag::find_flag(name, len);
+  if (result == NULL) return false;
+  if (!result->is_uint()) return false;
+  uint old_value = result->get_uint();
+  trace_flag_changed<EventUnsignedIntFlagChanged, u4>(name, old_value, *value, origin);
+  result->set_uint(*value);
+  *value = old_value;
+  result->set_origin(origin);
+  return true;
+}
+
+void CommandLineFlagsEx::uintAtPut(CommandLineFlagWithType flag, uint value, Flag::Flags origin) {
+  Flag* faddr = address_of_flag(flag);
+  guarantee(faddr != NULL && faddr->is_uint(), "wrong flag type");
+  trace_flag_changed<EventUnsignedIntFlagChanged, u4>(faddr->_name, faddr->get_uint(), value, origin);
+  faddr->set_uint(value);
+  faddr->set_origin(origin);
+}
+
 bool CommandLineFlags::intxAt(const char* name, size_t len, intx* value, bool allow_locked, bool return_flag) {
   Flag* result = Flag::find_flag(name, len, allow_locked, return_flag);
   if (result == NULL) return false;
--- a/hotspot/src/share/vm/runtime/globals.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -279,6 +279,14 @@
   bool get_bool() const;
   void set_bool(bool value);
 
+  bool is_int() const;
+  int get_int() const;
+  void set_int(int value);
+
+  bool is_uint() const;
+  uint get_uint() const;
+  void set_uint(uint value);
+
   bool is_intx() const;
   intx get_intx() const;
   void set_intx(intx value);
@@ -363,13 +371,28 @@
   ~CounterSetting()         { (*counter)--; }
 };
 
+class IntFlagSetting {
+  int val;
+  int* flag;
+ public:
+  IntFlagSetting(int& fl, int newValue) { flag = &fl; val = fl; fl = newValue; }
+  ~IntFlagSetting()                     { *flag = val; }
+};
 
 class UIntFlagSetting {
+  uint val;
+  uint* flag;
+ public:
+  UIntFlagSetting(uint& fl, uint newValue) { flag = &fl; val = fl; fl = newValue; }
+  ~UIntFlagSetting()                       { *flag = val; }
+};
+
+class UIntXFlagSetting {
   uintx val;
   uintx* flag;
  public:
-  UIntFlagSetting(uintx& fl, uintx newValue) { flag = &fl; val = fl; fl = newValue; }
-  ~UIntFlagSetting()                         { *flag = val; }
+  UIntXFlagSetting(uintx& fl, uintx newValue) { flag = &fl; val = fl; fl = newValue; }
+  ~UIntXFlagSetting()                         { *flag = val; }
 };
 
 class DoubleFlagSetting {
@@ -396,6 +419,16 @@
   static bool boolAtPut(const char* name, size_t len, bool* value, Flag::Flags origin);
   static bool boolAtPut(const char* name, bool* value, Flag::Flags origin)   { return boolAtPut(name, strlen(name), value, origin); }
 
+  static bool intAt(const char* name, size_t len, int* value, bool allow_locked = false, bool return_flag = false);
+  static bool intAt(const char* name, int* value, bool allow_locked = false, bool return_flag = false)      { return intAt(name, strlen(name), value, allow_locked, return_flag); }
+  static bool intAtPut(const char* name, size_t len, int* value, Flag::Flags origin);
+  static bool intAtPut(const char* name, int* value, Flag::Flags origin)   { return intAtPut(name, strlen(name), value, origin); }
+
+  static bool uintAt(const char* name, size_t len, uint* value, bool allow_locked = false, bool return_flag = false);
+  static bool uintAt(const char* name, uint* value, bool allow_locked = false, bool return_flag = false)      { return uintAt(name, strlen(name), value, allow_locked, return_flag); }
+  static bool uintAtPut(const char* name, size_t len, uint* value, Flag::Flags origin);
+  static bool uintAtPut(const char* name, uint* value, Flag::Flags origin)   { return uintAtPut(name, strlen(name), value, origin); }
+
   static bool intxAt(const char* name, size_t len, intx* value, bool allow_locked = false, bool return_flag = false);
   static bool intxAt(const char* name, intx* value, bool allow_locked = false, bool return_flag = false)      { return intxAt(name, strlen(name), value, allow_locked, return_flag); }
   static bool intxAtPut(const char* name, size_t len, intx* value, Flag::Flags origin);
--- a/hotspot/src/share/vm/runtime/globals_extension.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/runtime/globals_extension.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -197,6 +197,8 @@
 class CommandLineFlagsEx : CommandLineFlags {
  public:
   static void boolAtPut(CommandLineFlagWithType flag, bool value, Flag::Flags origin);
+  static void intAtPut(CommandLineFlagWithType flag, int value, Flag::Flags origin);
+  static void uintAtPut(CommandLineFlagWithType flag, uint value, Flag::Flags origin);
   static void intxAtPut(CommandLineFlagWithType flag, intx value, Flag::Flags origin);
   static void uintxAtPut(CommandLineFlagWithType flag, uintx value, Flag::Flags origin);
   static void uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, Flag::Flags origin);
--- a/hotspot/src/share/vm/runtime/vm_operations.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/runtime/vm_operations.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -192,7 +192,7 @@
   static const char* mode_to_string(Mode mode);
 
   // Debugging
-  void print_on_error(outputStream* st) const;
+  virtual void print_on_error(outputStream* st) const;
   const char* name() const { return _names[type()]; }
   static const char* name(int type) {
     assert(type >= 0 && type < VMOp_Terminating, "invalid VM operation type");
--- a/hotspot/src/share/vm/services/management.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/services/management.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -1558,6 +1558,12 @@
   if (flag->is_bool()) {
     global->value.z = flag->get_bool() ? JNI_TRUE : JNI_FALSE;
     global->type = JMM_VMGLOBAL_TYPE_JBOOLEAN;
+  } else if (flag->is_int()) {
+    global->value.j = (jlong)flag->get_int();
+    global->type = JMM_VMGLOBAL_TYPE_JLONG;
+  } else if (flag->is_uint()) {
+    global->value.j = (jlong)flag->get_uint();
+    global->type = JMM_VMGLOBAL_TYPE_JLONG;
   } else if (flag->is_intx()) {
     global->value.j = (jlong)flag->get_intx();
     global->type = JMM_VMGLOBAL_TYPE_JLONG;
--- a/hotspot/src/share/vm/services/writeableFlags.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/services/writeableFlags.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -44,6 +44,36 @@
   return CommandLineFlags::boolAtPut((char*)name, &value, origin) ? SUCCESS : ERR_OTHER;
 }
 
+// set a int global flag
+int WriteableFlags::set_int_flag(const char* name, const char* arg, Flag::Flags origin, FormatBuffer<80>& err_msg) {
+  int value;
+
+  if (sscanf(arg, "%d", &value)) {
+    return set_int_flag(name, value, origin, err_msg);
+  }
+  err_msg.print("flag value must be an integer");
+  return WRONG_FORMAT;
+}
+
+int WriteableFlags::set_int_flag(const char* name, int value, Flag::Flags origin, FormatBuffer<80>& err_msg) {
+  return CommandLineFlags::intAtPut((char*)name, &value, origin) ? SUCCESS : ERR_OTHER;
+}
+
+// set a uint global flag
+int WriteableFlags::set_uint_flag(const char* name, const char* arg, Flag::Flags origin, FormatBuffer<80>& err_msg) {
+  uint value;
+
+  if (sscanf(arg, "%u", &value)) {
+    return set_uint_flag(name, value, origin, err_msg);
+  }
+  err_msg.print("flag value must be an unsigned integer");
+  return WRONG_FORMAT;
+}
+
+int WriteableFlags::set_uint_flag(const char* name, uint value, Flag::Flags origin, FormatBuffer<80>& err_msg) {
+  return CommandLineFlags::uintAtPut((char*)name, &value, origin) ? SUCCESS : ERR_OTHER;
+}
+
 // set a intx global flag
 int WriteableFlags::set_intx_flag(const char* name, const char* arg, Flag::Flags origin, FormatBuffer<80>& err_msg) {
   intx value;
@@ -173,6 +203,10 @@
   }
   if (f->is_bool()) {
     return set_bool_flag(f->_name, flag_value, origin, err_msg);
+  } else if (f->is_int()) {
+    return set_int_flag(f->_name, flag_value, origin, err_msg);
+  } else if (f->is_uint()) {
+    return set_uint_flag(f->_name, flag_value, origin, err_msg);
   } else if (f->is_intx()) {
     return set_intx_flag(f->_name, flag_value, origin, err_msg);
   } else if (f->is_uintx()) {
@@ -195,6 +229,12 @@
   if (f->is_bool()) {
     bool bvalue = (new_value.z == JNI_TRUE ? true : false);
     return set_bool_flag(f->_name, bvalue, origin, err_msg);
+  } else if (f->is_int()) {
+    int ivalue = (int)new_value.j;
+    return set_int_flag(f->_name, ivalue, origin, err_msg);
+  } else if (f->is_uint()) {
+    uint uvalue = (uint)new_value.j;
+    return set_uint_flag(f->_name, uvalue, origin, err_msg);
   } else if (f->is_intx()) {
     intx ivalue = (intx)new_value.j;
     return set_intx_flag(f->_name, ivalue, origin, err_msg);
--- a/hotspot/src/share/vm/services/writeableFlags.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/services/writeableFlags.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -56,6 +56,10 @@
 
   // set a boolean global flag
   static int set_bool_flag(const char* name, const char* value, Flag::Flags origin, FormatBuffer<80>& err_msg);
+  // set a int global flag
+  static int set_int_flag(const char* name, const char* value, Flag::Flags origin, FormatBuffer<80>& err_msg);
+  // set a uint global flag
+  static int set_uint_flag(const char* name, const char* value, Flag::Flags origin, FormatBuffer<80>& err_msg);
   // set a intx global flag
   static int set_intx_flag(const char* name, const char* value, Flag::Flags origin, FormatBuffer<80>& err_msg);
   // set a uintx global flag
@@ -66,6 +70,10 @@
   static int set_size_t_flag(const char* name, const char* value, Flag::Flags origin, FormatBuffer<80>& err_msg);
   // set a boolean global flag
   static int set_bool_flag(const char* name, bool value, Flag::Flags origin, FormatBuffer<80>& err_msg);
+  // set a int global flag
+  static int set_int_flag(const char* name, int value, Flag::Flags origin, FormatBuffer<80>& err_msg);
+  // set a uint global flag
+  static int set_uint_flag(const char* name, uint value, Flag::Flags origin, FormatBuffer<80>& err_msg);
   // set a intx global flag
   static int set_intx_flag(const char* name, intx value, Flag::Flags origin, FormatBuffer<80>& err_msg);
   // set a uintx global flag
--- a/hotspot/src/share/vm/trace/trace.xml	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/trace/trace.xml	Wed Jul 05 20:39:35 2017 +0200
@@ -122,6 +122,22 @@
       <value type="CLASS" field="definingClassLoader" label="Defining Class Loader"/>
     </event>
 
+    <event id="IntFlagChanged" path="vm/flag/int_changed" label="Int Flag Changed"
+          is_instant="true">
+      <value type="UTF8" field="name" label="Name" />
+      <value type="INTEGER" field="old_value" label="Old Value" />
+      <value type="INTEGER" field="new_value" label="New Value" />
+      <value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
+    </event>
+
+    <event id="UnsignedIntFlagChanged" path="vm/flag/uint_changed" label="Unsigned Int Flag Changed"
+          is_instant="true">
+      <value type="UTF8" field="name" label="Name" />
+      <value type="UINT" field="old_value" label="Old Value" />
+      <value type="UINT" field="new_value" label="New Value" />
+      <value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
+    </event>
+
     <event id="LongFlagChanged" path="vm/flag/long_changed" label="Long Flag Changed"
           is_instant="true">
       <value type="UTF8" field="name" label="Name" />
--- a/hotspot/src/share/vm/utilities/events.cpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/utilities/events.cpp	Wed Jul 05 20:39:35 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
 EventLog* Events::_logs = NULL;
 StringEventLog* Events::_messages = NULL;
 StringEventLog* Events::_exceptions = NULL;
+StringEventLog* Events::_redefinitions = NULL;
 StringEventLog* Events::_deopt_messages = NULL;
 
 EventLog::EventLog() {
@@ -66,6 +67,7 @@
   if (LogEvents) {
     _messages = new StringEventLog("Events");
     _exceptions = new StringEventLog("Internal exceptions");
+    _redefinitions = new StringEventLog("Classes redefined");
     _deopt_messages = new StringEventLog("Deoptimization events");
   }
 }
--- a/hotspot/src/share/vm/utilities/events.hpp	Sun Jun 28 16:38:48 2015 -0700
+++ b/hotspot/src/share/vm/utilities/events.hpp	Wed Jul 05 20:39:35 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -186,6 +186,9 @@
   // Deoptization related messages
   static StringEventLog* _deopt_messages;
 
+  // Redefinition related messages
+  static StringEventLog* _redefinitions;
+
  public:
   static void print_all(outputStream* out);
 
@@ -198,6 +201,8 @@
   // Log exception related message
   static void log_exception(Thread* thread, const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
 
+  static void log_redefinition(Thread* thread, const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
+
   static void log_deopt_message(Thread* thread, const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
 
   // Register default loggers
@@ -222,6 +227,15 @@
   }
 }
 
+inline void Events::log_redefinition(Thread* thread, const char* format, ...) {
+  if (LogEvents) {
+    va_list ap;
+    va_start(ap, format);
+    _redefinitions->logv(thread, format, ap);
+    va_end(ap);
+  }
+}
+
 inline void Events::log_deopt_message(Thread* thread, const char* format, ...) {
   if (LogEvents) {
     va_list ap;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/arraycopy/TestLoadBypassArrayCopy.java	Wed Jul 05 20:39:35 2017 +0200
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8086046
+ * @summary load bypasses arraycopy that sets the value after the ArrayCopyNode is expanded
+ * @run main/othervm -XX:-BackgroundCompilation  -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestLoadBypassArrayCopy::test_helper -XX:-TieredCompilation TestLoadBypassArrayCopy
+ *
+ */
+
+public class TestLoadBypassArrayCopy {
+
+    static long i;
+    static boolean test_helper() {
+        i++;
+        if ((i%10) == 0) {
+            return false;
+        }
+        return true;
+    }
+
+    static int test(int[] src, int len, boolean flag) {
+        int[] dest = new int[10];
+        int res = 0;
+        while (test_helper()) {
+            System.arraycopy(src, 0, dest, 0, len);
+            // predicate moved out of loop so control of following
+            // load is not the ArrayCopyNode. Otherwise, if the memory
+            // of the load is changed and the control is set to the
+            // ArrayCopyNode the graph is unschedulable and the test
+            // doesn't fail.
+            if (flag) {
+            }
+            // The memory of this load shouldn't bypass the arraycopy
+            res = dest[0];
+        }
+        return res;
+    }