Skip to content
Permalink
Browse files
8261393: [lworld] Adopt `primitive' as the modifier in declaration of…
… identity free classes in lieu of `inline`
  • Loading branch information
Srikanth Adayapalam committed Feb 9, 2021
1 parent b2c84c7 commit 693282f34942df07527e249f971dadc8cad5de54
Showing with 602 additions and 603 deletions.
  1. +5 −5 src/java.base/share/classes/java/lang/{__inline__.java → __primitive__.java}
  2. +6 −6 src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
  3. +3 −3 src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
  4. +6 −6 src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
  5. +1 −1 src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java
  6. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/MyValue1.java
  7. +2 −2 test/hotspot/jtreg/compiler/valhalla/inlinetypes/MyValue2.java
  8. +2 −2 test/hotspot/jtreg/compiler/valhalla/inlinetypes/MyValue3.java
  9. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/MyValue4.java
  10. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/MyValueEmpty.java
  11. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/Point.java
  12. +2 −2 test/hotspot/jtreg/compiler/valhalla/inlinetypes/Rectangle.java
  13. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/SimpleInlineType.java
  14. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestArrayAccessDeopt.java
  15. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestArrayCopyWithOops.java
  16. +3 −3 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestArrays.java
  17. +4 −4 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestBasicFunctionality.java
  18. +2 −2 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestBimorphicInlining.java
  19. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestBufferTearing.java
  20. +4 −4 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestC1.java
  21. +5 −5 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestC2CCalls.java
  22. +9 −9 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConvention.java
  23. +13 −13 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConventionC1.java
  24. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestDeadAllocationRemoval.java
  25. +2 −2 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestDeoptimizationWhenBuffering.java
  26. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestFlatArrayAliasesCardMark.java
  27. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestFlatArrayThreshold.java
  28. +3 −3 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestGenerated.java
  29. +3 −3 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestGetfieldChains.java
  30. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestIntrinsics.java
  31. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestIsSubstitutableReresolution.java
  32. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestJNICalls.java
  33. +10 −10 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorld.java
  34. +2 −2 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorldProfiling.java
  35. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNativeClone.java
  36. +4 −4 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNestmateAccess.java
  37. +2 −2 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNewAcmp.java
  38. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableArrays.java
  39. +5 −5 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableInlineTypes.java
  40. +3 −3 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOnStackReplacement.java
  41. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOptimizeKlassCmp.java
  42. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestStressReturnBuffering.java
  43. +17 −17 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java
  44. +18 −18 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestUnloadedInlineTypeField.java
  45. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestUnresolvedDefault.java
  46. +1 −1 test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestWithfieldC1.java
  47. +2 −2 test/hotspot/jtreg/compiler/valhalla/inlinetypes/hack/GetUnresolvedInlineFieldWrongSignature.java
  48. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/CheckcastTest.java
  49. +10 −10 test/hotspot/jtreg/runtime/valhalla/inlinetypes/CircularityTest.java
  50. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/CreationErrorTest.java
  51. +2 −2 test/hotspot/jtreg/runtime/valhalla/inlinetypes/EmptyInlineTest.java
  52. +2 −2 test/hotspot/jtreg/runtime/valhalla/inlinetypes/Ifacmp.java
  53. +4 −4 test/hotspot/jtreg/runtime/valhalla/inlinetypes/InlineOops.java
  54. +3 −3 test/hotspot/jtreg/runtime/valhalla/inlinetypes/InlineTypeArray.java
  55. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/InlineTypeCreation.java
  56. +12 −12 test/hotspot/jtreg/runtime/valhalla/inlinetypes/InlineTypeDensity.java
  57. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/InlineWithJni.java
  58. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/IntValue.java
  59. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/JumboInline.java
  60. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/Long8Inline.java
  61. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/MultiANewArrayTest/Element1.java
  62. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/ObjectMethods.java
  63. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/Person.java
  64. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/Point.java
  65. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/QuickeningTest.java
  66. +7 −7 test/hotspot/jtreg/runtime/valhalla/inlinetypes/StaticFieldsTest.java
  67. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/Test8186715.java
  68. +3 −3 test/hotspot/jtreg/runtime/valhalla/inlinetypes/TestFieldNullability.java
  69. +6 −6 test/hotspot/jtreg/runtime/valhalla/inlinetypes/TestJNIArrays.java
  70. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/TestJNIIsSameObject.java
  71. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/TestValue1.java
  72. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/TestValue2.java
  73. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/TestValue3.java
  74. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/TestValue4.java
  75. +3 −3 test/hotspot/jtreg/runtime/valhalla/inlinetypes/UnsafeTest.java
  76. +2 −2 test/hotspot/jtreg/runtime/valhalla/inlinetypes/VDefaultTest.java
  77. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/VWithFieldTest.java
  78. +2 −2 test/hotspot/jtreg/runtime/valhalla/inlinetypes/ValueTearing.java
  79. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/VarArgsArray.java
  80. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/VolatileTest.java
  81. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/WithFieldAccessorTest.java
  82. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/identityObject/InlineType.java
  83. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/verifier/VTAssignability.java
  84. +1 −1 test/hotspot/jtreg/runtime/valhalla/inlinetypes/verifier/VTMonitor.java
  85. +1 −1 test/jdk/valhalla/valuetypes/InlineConstructorTest.java
  86. +1 −1 test/jdk/valhalla/valuetypes/InlineTypeConversionTest.java
  87. +1 −1 test/jdk/valhalla/valuetypes/LambdaConversion.java
  88. +1 −1 test/jdk/valhalla/valuetypes/Line.java
  89. +1 −1 test/jdk/valhalla/valuetypes/NonFlattenValue.java
  90. +3 −3 test/jdk/valhalla/valuetypes/ObjectMethods.java
  91. +1 −1 test/jdk/valhalla/valuetypes/Point.java
  92. +1 −1 test/jdk/valhalla/valuetypes/QTypeDescriptorTest.java
  93. +4 −4 test/jdk/valhalla/valuetypes/Serialization.java
  94. +2 −2 test/jdk/valhalla/valuetypes/StaticInitFactoryTest.java
  95. +1 −1 test/jdk/valhalla/valuetypes/StreamTest.java
  96. +2 −2 test/jdk/valhalla/valuetypes/SubstitutabilityTest.java
  97. +2 −2 test/jdk/valhalla/valuetypes/UninitializedInlineValueTest.java
  98. +3 −3 test/jdk/valhalla/valuetypes/Value.java
  99. +1 −1 test/jdk/valhalla/valuetypes/ValueBootstrapMethods.java
  100. +1 −2 test/langtools/tools/javac/diags/CheckResourceKeys.java
  101. +1 −1 test/langtools/tools/javac/diags/examples/InlineMayNotOverride.java
  102. +1 −1 test/langtools/tools/javac/diags/examples/ProjectionCantBeInstantiated.java
  103. +1 −1 test/langtools/tools/javac/diags/examples/ValueInstanceFieldExpectedHere.java
  104. +1 −1 test/langtools/tools/javac/diags/examples/ValuesNotSupported.java
  105. +1 −1 test/langtools/tools/javac/diags/examples/WithFieldOperatorDisallowed.java
  106. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/AnonymousValue.java
  107. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/AnonymousValueType.java
  108. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ArrayCreationWithQuestion.java
  109. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ArrayRelationsTest.java
  110. +5 −5 test/langtools/tools/javac/valhalla/lworld-values/AssortedTests.java
  111. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/AttributesTest.java
  112. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/AutoCloseableTest.java
  113. +12 −12 test/langtools/tools/javac/valhalla/lworld-values/BinarySuperclassConstraints.java
  114. +7 −7 test/langtools/tools/javac/valhalla/lworld-values/BinarySuperclassConstraints.out
  115. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/BoxValCastTest.java
  116. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CanonicalCtorTest.java
  117. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CastNullCheckTest.java
  118. +17 −17 test/langtools/tools/javac/valhalla/lworld-values/ChainedAssignmentTest.java
  119. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckBadSelector.java
  120. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/CheckClone.java
  121. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/CheckCyclicMembership.java
  122. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/CheckExtends.java
  123. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckExtends.out
  124. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckFeatureGate1.java
  125. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckFieldDescriptors.java
  126. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckFinal.java
  127. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/CheckFinalize.java
  128. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/CheckFlattenableCycles.java
  129. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/CheckFlattenableSyntheticFields.java
  130. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckIdentityHash.java
  131. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckIdentityHash01.java
  132. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/CheckLocalClasses.java
  133. +4 −4 test/langtools/tools/javac/valhalla/lworld-values/CheckMakeDefault.java
  134. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/CheckMakeDefault.out
  135. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckMultiDimensionalArrayStore.java
  136. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckNullAssign.java
  137. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckNullCastable.java
  138. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckNullWithQuestion.java
  139. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckObjectMethodsUsage.java
  140. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckQuestionInMessages.java
  141. +16 −16 test/langtools/tools/javac/valhalla/lworld-values/CheckSeparateCompile0.java
  142. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckStaticFinalAssign.java
  143. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/CheckSync.java
  144. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckSynchronized.java
  145. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CheckThisLeak.java
  146. +6 −6 test/langtools/tools/javac/valhalla/lworld-values/CheckValueModifier.java
  147. +6 −6 test/langtools/tools/javac/valhalla/lworld-values/CheckValueModifier.out
  148. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ClassLiteralNegativeTest.java
  149. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/ClassLiteralTypingNegativeTest.java
  150. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ClassLiteralTypingTest.java
  151. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CompilerNoBogusAssert.java
  152. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/CompilesJustFine.java
  153. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ConditionalInlineTypeTest.java
  154. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/ConditionalTypeTest.java
  155. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ConflictingSuperInterfaceTest.java
  156. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ConflictingSuperInterfaceTest.out
  157. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ConstantPropagationTest.java
  158. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CovariantArrayTest.java
  159. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/CtorChain.java
  160. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/DefaultNonInlines.java
  161. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/DocLintSyntheticsTest.java
  162. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/DualPathInnerType.java
  163. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/EmptyValueTest.java
  164. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/EnhancedForLoopTest.java
  165. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ExplicitLambdaWithNullableTypes.java
  166. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ExplicitLambdaWithNullableTypes2.java
  167. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ExplicitLambdaWithNullableTypes3.java
  168. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/FinalFieldTest.java
  169. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/FlattenableFlagFromClass.java
  170. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/FlattenableNegativeTest.java
  171. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericArrayRegression.java
  172. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericArrayTest.java
  173. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericInlineTest.java
  174. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericsAndValues1.java
  175. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericsAndValues2.java
  176. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericsAndValues3.java
  177. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericsAndValues4.java
  178. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericsAndValues5.java
  179. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/GenericsWithQuestion.java
  180. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/IllegalByValueTest.java
  181. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/IllegalByValueTest.out
  182. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/IllegalByValueTest2.java
  183. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/IllegalByValueTest2.out
  184. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/InferredValueParameterizationTest.java
  185. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/InlineAnnotationOnAnonymousClass.java
  186. +4 −4 test/langtools/tools/javac/valhalla/lworld-values/InlineAnnotationTest.java
  187. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/InlineClassTest.java
  188. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/InlineDiamondTest.java
  189. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/InnerClassAttributeValuenessTest.java
  190. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/InnerValueNew.java
  191. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/InstanceOfTopTypeTest.java
  192. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/InstanceofProjectionArray.java
  193. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/IntercastTest.java
  194. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/IntercastTest2.java
  195. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/LocalValueNew.java
  196. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/LookupOnLoxTest.java
  197. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/LookupOnLoxTest2.java
  198. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/LubWithInlines.java
  199. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/MiscThisLeak.java
  200. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/MyValue.java
  201. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/NoCrashTest.java
  202. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/NoVolatileFields.java
  203. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/OverloadingPhaseTest.java
  204. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/OverloadingPhaseTest2.java
  205. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ParameterizedDefault.java
  206. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/Point.java
  207. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ProjectedArrayDotClass.java
  208. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ProjectionInstantiationTest.java
  209. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ProjectionRelationsTest.java
  210. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/ProperTypeApplySelectTest.java
  211. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/QPoint.java
  212. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/QTypedValue.java
  213. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/QualifiedSuperCtor.java
  214. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/QualifiedThisTest.java
  215. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/Range.java
  216. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/RefDotClass.java
  217. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/SeparateCompileTest01.java
  218. +10 −10 test/langtools/tools/javac/valhalla/lworld-values/SideEffectTest.java
  219. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/SignatureTest.java
  220. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/SmallSet.java
  221. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/SneakThroSuperCallTest.java
  222. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/StaticSelectedThroughProjection.java
  223. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/StreamsTest.java
  224. +14 −14 test/langtools/tools/javac/valhalla/lworld-values/SuperclassConstraints.java
  225. +7 −7 test/langtools/tools/javac/valhalla/lworld-values/SuperclassConstraints.out
  226. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/TestQualifierOnInit.java
  227. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/ThisIsNotAnInstanceField.java
  228. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/TopInterfaceNegativeTest.java
  229. +4 −4 test/langtools/tools/javac/valhalla/lworld-values/TopInterfaceNegativeTest.out
  230. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/TopInterfaceTest.java
  231. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/TypeRelationsNegativeTest.java
  232. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/TypeRelationsTest.java
  233. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/UnannotatedProjection.java
  234. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/UncheckedDefault.java
  235. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/UnrelatedThisLeak.java
  236. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/ValueAnnotationOnAnonymousClass.java
  237. +4 −4 test/langtools/tools/javac/valhalla/lworld-values/ValueAnnotationTest.java
  238. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/ValueAsEnclosingClass.java
  239. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ValueBootstrapMethodsTest.java
  240. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ValueConstructorRef.java
  241. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ValueCreationTest.java
  242. +3 −3 test/langtools/tools/javac/valhalla/lworld-values/ValueModifierTest.java
  243. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/ValueModifierTest.out
  244. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ValueNewReadWrite.java
  245. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/ValueOverGenericsTest.java
  246. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/ValuesAsRefs.java
  247. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/WithFieldAccessorTest.java
  248. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/WithFieldNegativeTests.java
  249. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/WithFieldOfExplicitSelector.java
  250. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/WithFieldOfGenericType.java
  251. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/WithFieldOfImplicitThis.java
  252. +2 −2 test/langtools/tools/javac/valhalla/lworld-values/WithFieldOperatorTest.java
  253. +1 −1 test/langtools/tools/javac/valhalla/lworld-values/WithFieldRuntimeTest.java
  254. +4 −4 test/micro/org/openjdk/bench/valhalla/invoke/InlineArray0.java
  255. +4 −4 test/micro/org/openjdk/bench/valhalla/invoke/InlineArray1.java
  256. +4 −4 test/micro/org/openjdk/bench/valhalla/invoke/InlineArrayHashExplicit.java
  257. +4 −4 test/micro/org/openjdk/bench/valhalla/invoke/InlineArrayHashImplicit.java
  258. +3 −3 test/micro/org/openjdk/bench/valhalla/invoke/InlineField.java
  259. +3 −3 test/micro/org/openjdk/bench/valhalla/invoke/InlineField1.java
  260. +1 −1 test/micro/org/openjdk/bench/valhalla/invoke/InlineRec.java
  261. +1 −1 test/micro/org/openjdk/bench/valhalla/sandbox/corelibs/PrimitiveInt.java
  262. +1 −1 test/micro/org/openjdk/bench/valhalla/sandbox/corelibs/XArrayList.java
  263. +2 −2 test/micro/org/openjdk/bench/valhalla/sandbox/corelibs/mapprotos/HashMap.java
  264. +2 −2 test/micro/org/openjdk/bench/valhalla/sandbox/corelibs/mapprotos/XHashMap.java
  265. +1 −1 test/micro/org/openjdk/bench/valhalla/types/Q128byte.java
  266. +1 −1 test/micro/org/openjdk/bench/valhalla/types/Q128int.java
  267. +1 −1 test/micro/org/openjdk/bench/valhalla/types/Q128long.java
  268. +1 −1 test/micro/org/openjdk/bench/valhalla/types/Q32byte.java
  269. +1 −1 test/micro/org/openjdk/bench/valhalla/types/Q32int.java
  270. +1 −1 test/micro/org/openjdk/bench/valhalla/types/Q64byte.java
  271. +1 −1 test/micro/org/openjdk/bench/valhalla/types/Q64int.java
  272. +1 −1 test/micro/org/openjdk/bench/valhalla/types/Q64long.java
  273. +1 −1 test/micro/org/openjdk/bench/valhalla/types/QComplex.java
  274. +1 −1 test/micro/org/openjdk/bench/valhalla/types/QOpt.java
@@ -29,12 +29,12 @@
import static java.lang.annotation.ElementType.*;

/**
* A class annotated {@code @__inline__} is an inline class.
* This is a temporary workaround to enable use of inline types
* in editors and IDEs that do not yet understand the 'inline' modifier.
* @since 1.12
* A class annotated {@code @__primitive__} is a primitive class.
* This is a temporary workaround to enable use of primitive classes
* in editors and IDEs that do not yet understand the 'primitive' modifier.
* @since 1.16
*/
@Retention(RetentionPolicy.SOURCE)
@Target(value={ElementType.TYPE, ElementType.TYPE_USE})
public @interface __inline__ {
public @interface __primitive__ {
}
@@ -2675,7 +2675,7 @@ JCStatement parseStatementAsBlock() {
case CONTINUE: case SEMI: case ELSE: case FINALLY: case CATCH:
case ASSERT:
return List.of(parseSimpleStatement());
case VALUE:
case PRIMITIVE:
case MONKEYS_AT:
case FINAL: {
dc = token.comment(CommentStyle.JAVADOC);
@@ -3210,7 +3210,7 @@ protected JCModifiers modifiersOpt(JCModifiers partial) {
case FINAL : flag = Flags.FINAL; break;
case ABSTRACT : flag = Flags.ABSTRACT; break;
case NATIVE : flag = Flags.NATIVE; break;
case VALUE : flag = Flags.VALUE; break;
case PRIMITIVE : flag = Flags.VALUE; break;
case VOLATILE : flag = Flags.VOLATILE; break;
case SYNCHRONIZED: flag = Flags.SYNCHRONIZED; break;
case STRICTFP : flag = Flags.STRICTFP; break;
@@ -3243,7 +3243,7 @@ protected JCModifiers modifiersOpt(JCModifiers partial) {
if (flags == 0 && annotations.isEmpty())
pos = ann.pos;
final Name name = TreeInfo.name(ann.annotationType);
if (name == names.__inline__ || name == names.java_lang___inline__) {
if (name == names.__primitive__ || name == names.java_lang___primitive__) {
flag = Flags.VALUE;
} else {
annotations.append(ann);
@@ -3458,9 +3458,9 @@ JCVariableDecl variableDeclaratorRest(int pos, JCModifiers mods, JCExpression ty
return result;
}

// Does the given token signal an inline modifier ? If yes, suitably reclassify token.
// Does the given token signal a primitive modifier ? If yes, suitably reclassify token.
Token recastToken(Token token) {
if (token.kind != IDENTIFIER || token.name() != names.inline) {
if (token.kind != IDENTIFIER || token.name() != names.primitive) {
return token;
}
if (peekToken(t->t == PRIVATE ||
@@ -3489,7 +3489,7 @@ Token recastToken(Token token) {
t == ENUM ||
t == IDENTIFIER)) { // new value Comparable() {}
checkSourceLevel(Feature.INLINE_TYPES);
return new Token(VALUE, token.pos, token.endPos, token.comments);
return new Token(PRIMITIVE, token.pos, token.endPos, token.comments);
}
return token;
}
@@ -141,7 +141,7 @@ TokenKind lookupKind(String name) {
THROWS("throws"),
TRANSIENT("transient"),
TRY("try"),
VALUE(), // a phantom token never returned by the scanner, but can result from a reclassification by the parser.
PRIMITIVE(), // a phantom token never returned by the scanner, but can result from a reclassification by the parser.
VOID("void", Tag.NAMED),
VOLATILE("volatile"),
WHILE("while"),
@@ -246,8 +246,8 @@ public String toString() {
return "token.double";
case ERROR:
return "token.bad-symbol";
case VALUE:
return "value";
case PRIMITIVE:
return "primitive";
case EOF:
return "token.end-of-input";
case DOT: case COMMA: case SEMI: case LPAREN: case RPAREN:
@@ -100,7 +100,7 @@ public static Names instance(Context context) {
public final Name serialVersionUID;
public final Name toString;
public final Name value;
public final Name inline;
public final Name primitive;
public final Name valueOf;
public final Name values;
public final Name readResolve;
@@ -113,8 +113,8 @@ public static Names instance(Context context) {
public final Name java_lang_Enum;
public final Name java_lang_Object;
public final Name java_lang_System;
public final Name __inline__;
public final Name java_lang___inline__;
public final Name __primitive__;
public final Name java_lang___primitive__;
public final Name java_lang_IdentityObject;

// names of builtin classes
@@ -285,7 +285,7 @@ public Names(Context context) {
serialVersionUID = fromString("serialVersionUID");
toString = fromString("toString");
value = fromString("value");
inline = fromString("inline");
primitive = fromString("primitive");
valueOf = fromString("valueOf");
values = fromString("values");
readResolve = fromString("readResolve");
@@ -299,8 +299,8 @@ public Names(Context context) {
java_lang_Enum = fromString("java.lang.Enum");
java_lang_Object = fromString("java.lang.Object");
java_lang_System = fromString("java.lang.System");
__inline__ = fromString("__inline__");
java_lang___inline__ = fromString("java.lang.__inline__");
__primitive__ = fromString("__primitive__");
java_lang___primitive__ = fromString("java.lang.__primitive__");
java_lang_IdentityObject = fromString("java.lang.IdentityObject");

// names of builtin classes
@@ -230,7 +230,7 @@ public void report(JCDiagnostic diagnostic) {
PUBLIC(TokenKind.PUBLIC, XDECL1 | XMODIFIER), // public
TRANSIENT(TokenKind.TRANSIENT, XDECL1 | XMODIFIER), // transient
VOLATILE(TokenKind.VOLATILE, XDECL1 | XMODIFIER), // volatile
VALUE(TokenKind.VALUE, 0),
PRIMITIVE(TokenKind.PRIMITIVE, 0),

// Declarations and type parameters (thus expressions)
EXTENDS(TokenKind.EXTENDS, XEXPR|XDECL), // extends
@@ -23,7 +23,7 @@

package compiler.valhalla.inlinetypes;

public final inline class MyValue1 extends MyAbstract {
public final primitive class MyValue1 extends MyAbstract {
static int s;
static final long sf = InlineTypeTest.rL;
final int x;
@@ -23,7 +23,7 @@

package compiler.valhalla.inlinetypes;

final inline class MyValue2Inline {
final primitive class MyValue2Inline {
final double d;
final long l;

@@ -57,7 +57,7 @@ public static MyValue2Inline createWithFieldsInline(double d, long l) {
}
}

public final inline class MyValue2 extends MyAbstract {
public final primitive class MyValue2 extends MyAbstract {
final int x;
final byte y;
final MyValue2Inline v;
@@ -26,7 +26,7 @@
import jdk.test.lib.Asserts;
import jdk.test.lib.Utils;

final inline class MyValue3Inline {
final primitive class MyValue3Inline {
final float f7;
final double f8;

@@ -62,7 +62,7 @@ public static MyValue3Inline createWithFieldsInline(float f7, double f8) {

// Inline type definition to stress test return of an inline type in registers
// (uses all registers of calling convention on x86_64)
public final inline class MyValue3 extends MyAbstract {
public final primitive class MyValue3 extends MyAbstract {
final char c;
final byte bb;
final short s;
@@ -24,7 +24,7 @@
package compiler.valhalla.inlinetypes;

// Inline type definition with too many fields to return in registers
final inline class MyValue4 extends MyAbstract {
final primitive class MyValue4 extends MyAbstract {
final MyValue3 v1;
final MyValue3 v2;

@@ -23,7 +23,7 @@

package compiler.valhalla.inlinetypes;

public final inline class MyValueEmpty extends MyAbstract {
public final primitive class MyValueEmpty extends MyAbstract {
public long hash() { return 0; }

public MyValueEmpty copy(MyValueEmpty other) { return other; }
@@ -23,7 +23,7 @@

package compiler.valhalla.inlinetypes;

public inline class Point {
public primitive class Point {
int x = 4;
int y = 7;
}
@@ -23,7 +23,7 @@

package compiler.valhalla.inlinetypes;

public inline class Rectangle {
public primitive class Rectangle {
Point p0 = new Point();
Point p1 = new Point();
}
}
@@ -21,7 +21,7 @@
* questions.
*/

final inline class SimpleInlineType {
final primitive class SimpleInlineType {
final int x;

private SimpleInlineType() {
@@ -33,7 +33,7 @@
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;

final inline class MyValue1 {
final primitive class MyValue1 {
public final int x = 0;
}

@@ -49,7 +49,7 @@
long val = Integer.MAX_VALUE;
}

static inline class ManyOops {
static primitive class ManyOops {
MyObject o1 = new MyObject();
MyObject o2 = new MyObject();
MyObject o3 = new MyObject();
@@ -1865,7 +1865,7 @@ public void test79_verifier(boolean warmup) {
Asserts.assertEquals(result, i);
}

inline static class NotFlattenable {
primitive static class NotFlattenable {
private final Object o1 = null;
private final Object o2 = null;
private final Object o3 = null;
@@ -2162,7 +2162,7 @@ public void test90_verifier(boolean warmup) {
Asserts.assertEQ(test90(), true);
}

inline static final class Test91Value {
primitive static final class Test91Value {
public final int f0;
public final int f1;
public final int f2;
@@ -3014,7 +3014,7 @@ public void test130_verifier(boolean warmup) {
Asserts.assertEquals(empty, MyValueEmpty.default);
}

static inline class EmptyContainer {
static primitive class EmptyContainer {
MyValueEmpty empty = MyValueEmpty.default;
}

@@ -786,12 +786,12 @@ public void test36_verifier(boolean warmup) {
}

// Test correct loading of flattened fields
inline class Test37Value2 {
primitive class Test37Value2 {
final int x = 0;
final int y = 0;
}

inline class Test37Value1 {
primitive class Test37Value1 {
final double d = 0;
final float f = 0;
final Test37Value2 v = new Test37Value2();
@@ -809,7 +809,7 @@ public void test37_verifier(boolean warmup) {
}

// Test elimination of inline type allocations without a unique CheckCastPP
inline class Test38Value {
primitive class Test38Value {
public int i;
public Test38Value(int i) { this.i = i; }
}
@@ -836,7 +836,7 @@ public void test38_verifier(boolean warmup) {
}

// Tests split if with inline type Phi users
static inline class Test39Value {
static primitive class Test39Value {
public int iFld1;
public int iFld2;

@@ -47,7 +47,7 @@
public MyInterface hash(MyInterface arg);
}

inline final class TestValue1 implements MyInterface {
primitive final class TestValue1 implements MyInterface {
final int x;

public TestValue1(int x) {
@@ -59,7 +59,7 @@ public TestValue1 hash(MyInterface arg) {
}
}

inline final class TestValue2 implements MyInterface {
primitive final class TestValue2 implements MyInterface {
final int x;

public TestValue2(int x) {
@@ -54,7 +54,7 @@
* compiler.valhalla.inlinetypes.TestBufferTearing
*/

inline class MyValue {
primitive class MyValue {
int x;
int y;

@@ -106,7 +106,7 @@ public void test1_verifier(boolean warmup) {
Asserts.assertEQ(r2, 0x1234567812345678L);
}

static inline class SimpleValue2 {
static primitive class SimpleValue2 {
final int value;
SimpleValue2(int value) {
this.value = value;
@@ -207,7 +207,7 @@ public void test6_verifier(boolean warmup) {
}

// Test 1st level sub-element access to non-flattened field
static inline class Big {
static primitive class Big {
long l0,l1,l2,l3,l4,l5,l6,l7,l8,l9,l10,l11,l12,l13,l14,l15,l16,l17,l18,l19 ;

Big(long n) {
@@ -240,7 +240,7 @@ void check(long n, int i) {
}
}

static inline class TestValue {
static primitive class TestValue {
int i;
Big big;

@@ -288,7 +288,7 @@ public void test8_verifier(boolean warmup) {
// (read/write are not performed, pre-allocated instance is used for reads)
// Most tests check that error conditions are still correctly handled
// (OOB, null pointer)
static inline class EmptyType {}
static primitive class EmptyType {}

@Test(compLevel=C1)
public EmptyType test9() {

0 comments on commit 693282f

Please sign in to comment.