RFR: Merge lworld [v2]

David Simms dsimms at openjdk.java.net
Thu Feb 25 09:31:28 UTC 2021


> Merge tag 'jdk-17+11'
> 
> # Conflicts:
> #	src/hotspot/share/classfile/classFileParser.cpp
> #	src/hotspot/share/classfile/classFileParser.hpp
> #	src/hotspot/share/oops/instanceKlass.hpp
> #	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java

David Simms has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 21 commits:

 - Merge branch 'lworld' into type-restrictions_merge_lworld_17_11
   
   # Conflicts:
   #	src/hotspot/share/classfile/classFileParser.cpp
   #	src/hotspot/share/classfile/classFileParser.hpp
   #	src/hotspot/share/oops/instanceKlass.hpp
   #	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
 - 8262202: [type-restrictions] RestrictedMethodTest failed to compile
 - 8261956: [type-restrictions] Support RestrictedMethod in the interpreter
   
   Reviewed-by: dsimms, hseigel
 - Merge lworld
   
   Merge 'jdk-17+10'
 - Merge lworld
   
   Merge lworld at jdk-17+8
 - 8260870: [type-restrictions] Generate RestrictedMethod attributes
 - 8257600: [type-restrictions] Implement RestrictedField in C1
   
   Reviewed-by: lfoltan, thartmann
 - Merge lworld
   
   Merge tag 'jdk-16+26'
 - 8257028: [type-restrictions] Assorted issues with generation of RestrictedField attributes from annotations
 - 8255856: Generate RestrictedField attributes from annotations
 - ... and 11 more: https://git.openjdk.java.net/valhalla/compare/ab51b601...94ce3695

-------------

Changes: https://git.openjdk.java.net/valhalla/pull/352/files
 Webrev: https://webrevs.openjdk.java.net/?repo=valhalla&pr=352&range=01
  Stats: 2395 lines in 62 files changed: 2306 ins; 12 del; 77 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/352.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/352/head:pull/352

PR: https://git.openjdk.java.net/valhalla/pull/352


More information about the valhalla-dev mailing list