--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java	Thu Jun 27 03:33:44 2019 +0200
@@ -195,7 +195,8 @@
             AOTDynamicTypeStore dynoStore = new AOTDynamicTypeStore();
             AOTCompiledClass.setDynamicTypeStore(dynoStore);
 
-            // AOTBackend aotBackend = new AOTBackend(this, graalOptions, backend, new HotSpotInvokeDynamicPlugin(dynoStore));
+            // AOTBackend aotBackend = new AOTBackend(this, graalOptions, backend, new
+            // HotSpotInvokeDynamicPlugin(dynoStore));
             // Temporary workaround until JDK-8223533 is fixed.
             // Disable invokedynamic support.
             var indyPlugin = new HotSpotInvokeDynamicPlugin(dynoStore) {

--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MarkId.java	Thu Jun 27 03:33:44 2019 +0200
@@ -25,6 +25,7 @@
 
 package jdk.tools.jaotc;
 
+import java.util.HashMap;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 
 /**
@@ -56,17 +57,22 @@
     INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED("CodeInstaller::INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED");
 
     private final int value;
+    private static HashMap<Integer, MarkId> lookup = new HashMap<Integer, MarkId>();
 
+    static {
+        for (MarkId e : values()) {
+            lookup.put(e.value, e);
+        }
+    }
     MarkId(String name) {
         this.value = (int) (long) HotSpotJVMCIRuntime.runtime().getConfigStore().getConstants().get(name);
     }
 
     static MarkId getEnum(int value) {
-        for (MarkId e : values()) {
-            if (e.value == value) {
-                return e;
-            }
+        MarkId e = lookup.get(value);
+        if (e == null) {
+            throw new InternalError("Unknown enum value: " + value);
         }
-        throw new InternalError("Unknown enum value: " + value);
+        return e;
     }
 }

--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/MetadataBuilder.java	Thu Jun 27 03:33:44 2019 +0200
@@ -28,12 +28,12 @@
 import static jdk.tools.jaotc.AOTCompiledClass.getType;
 import static jdk.tools.jaotc.AOTCompiledClass.metadataName;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
+import org.graalvm.compiler.hotspot.HotSpotGraalServices;
 
 import jdk.tools.jaotc.binformat.BinaryContainer;
 import jdk.tools.jaotc.binformat.ByteContainer;
@@ -82,12 +82,6 @@
         HotSpotGraalRuntimeProvider runtime = dataBuilder.getBackend().getRuntime();
         ByteContainer methodMetadataContainer = binaryContainer.getMethodMetadataContainer();
 
-        Method implicitExceptionsMethod = null;
-        try {
-            implicitExceptionsMethod = HotSpotMetaData.class.getDeclaredMethod("implicitExceptionBytes");
-        } catch (NoSuchMethodException e) {
-        }
-
         // For each of the compiled java methods, create records holding information about them.
         for (CompiledMethodInfo methodInfo : compiledClass.getCompiledMethods()) {
             // Get the current offset in the methodmetadata container.
@@ -104,6 +98,7 @@
             byte[] scopeDesc = metaData.scopesDescBytes();
             byte[] relocationInfo = metaData.relocBytes();
             byte[] oopMapInfo = metaData.oopMaps();
+            byte[] implicitExceptionBytes = HotSpotGraalServices.getImplicitExceptionBytes(metaData);
 
             // create a global symbol at this position for this method
             NativeOrderOutputStream metadataStream = new NativeOrderOutputStream();
@@ -148,10 +143,9 @@
                 NativeOrderOutputStream.PatchableInt scopeOffset = metadataStream.patchableInt();
                 NativeOrderOutputStream.PatchableInt relocationOffset = metadataStream.patchableInt();
                 NativeOrderOutputStream.PatchableInt exceptionOffset = metadataStream.patchableInt();
-                NativeOrderOutputStream.PatchableInt implictTableOFfset = null;
-
-                if (implicitExceptionsMethod != null) {
-                    implictTableOFfset = metadataStream.patchableInt();
+                NativeOrderOutputStream.PatchableInt implictTableOffset = null;
+                if (implicitExceptionBytes != null) {
+                    implictTableOffset = metadataStream.patchableInt();
                 }
                 NativeOrderOutputStream.PatchableInt oopMapOffset = metadataStream.patchableInt();
                 metadataStream.align(8);
@@ -168,10 +162,9 @@
                 exceptionOffset.set(metadataStream.position());
                 metadataStream.put(metaData.exceptionBytes()).align(8);
 
-                if (implicitExceptionsMethod != null) {
-                    implictTableOFfset.set(metadataStream.position());
-                    byte[] data = (byte[]) implicitExceptionsMethod.invoke(metaData);
-                    metadataStream.put(data).align(8);
+                if (implicitExceptionBytes != null) {
+                    implictTableOffset.set(metadataStream.position());
+                    metadataStream.put(implicitExceptionBytes).align(8);
                 }
 
                 // oopmaps should be last

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java	Thu Jun 27 03:33:44 2019 +0200
@@ -47,7 +47,7 @@
 /**
  * Memory efficient map data structure.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface EconomicMap<K, V> extends UnmodifiableEconomicMap<K, V> {
 
@@ -57,14 +57,14 @@
      *
      * @return the previous value associated with {@code key}, or {@code null} if there was no
      *         mapping for {@code key}.
-     * @since 1.0
+     * @since 19.0
      */
     V put(K key, V value);
 
     /**
      * Copies all of the mappings from {@code other} to this map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void putAll(EconomicMap<K, V> other) {
         MapCursor<K, V> e = other.getEntries();
@@ -76,7 +76,7 @@
     /**
      * Copies all of the mappings from {@code other} to this map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void putAll(UnmodifiableEconomicMap<? extends K, ? extends V> other) {
         UnmodifiableMapCursor<? extends K, ? extends V> entry = other.getEntries();
@@ -88,7 +88,7 @@
     /**
      * Removes all of the mappings from this map. The map will be empty after this call returns.
      *
-     * @since 1.0
+     * @since 19.0
      */
     void clear();
 
@@ -98,14 +98,14 @@
      *
      * @return the previous value associated with {@code key}, or {@code null} if there was no
      *         mapping for {@code key}.
-     * @since 1.0
+     * @since 19.0
      */
     V removeKey(K key);
 
     /**
      * Returns a {@link MapCursor} view of the mappings contained in this map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     MapCursor<K, V> getEntries();
@@ -115,7 +115,7 @@
      * all entries have been processed or the function throws an exception. Exceptions thrown by the
      * function are relayed to the caller.
      *
-     * @since 1.0
+     * @since 19.0
      */
     void replaceAll(BiFunction<? super K, ? super V, ? extends V> function);
 
@@ -123,7 +123,7 @@
      * Creates a new map that guarantees insertion order on the key set with the default
      * {@link Equivalence#DEFAULT} comparison strategy for keys.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <K, V> EconomicMap<K, V> create() {
         return EconomicMap.create(Equivalence.DEFAULT);
@@ -134,7 +134,7 @@
      * {@link Equivalence#DEFAULT} comparison strategy for keys and initializes with a specified
      * capacity.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <K, V> EconomicMap<K, V> create(int initialCapacity) {
         return EconomicMap.create(Equivalence.DEFAULT, initialCapacity);
@@ -144,7 +144,7 @@
      * Creates a new map that guarantees insertion order on the key set with the given comparison
      * strategy for keys.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <K, V> EconomicMap<K, V> create(Equivalence strategy) {
         return EconomicMapImpl.create(strategy, false);
@@ -155,7 +155,7 @@
      * {@link Equivalence#DEFAULT} comparison strategy for keys and copies all elements from the
      * specified existing map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <K, V> EconomicMap<K, V> create(UnmodifiableEconomicMap<K, V> m) {
         return EconomicMap.create(Equivalence.DEFAULT, m);
@@ -165,7 +165,7 @@
      * Creates a new map that guarantees insertion order on the key set and copies all elements from
      * the specified existing map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <K, V> EconomicMap<K, V> create(Equivalence strategy, UnmodifiableEconomicMap<K, V> m) {
         return EconomicMapImpl.create(strategy, m, false);
@@ -175,7 +175,7 @@
      * Creates a new map that guarantees insertion order on the key set and initializes with a
      * specified capacity.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <K, V> EconomicMap<K, V> create(Equivalence strategy, int initialCapacity) {
         return EconomicMapImpl.create(strategy, initialCapacity, false);
@@ -184,7 +184,7 @@
     /**
      * Wraps an existing {@link Map} as an {@link EconomicMap}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <K, V> EconomicMap<K, V> wrapMap(Map<K, V> map) {
         return new EconomicMap<K, V>() {

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicSet.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicSet.java	Thu Jun 27 03:33:44 2019 +0200
@@ -45,7 +45,7 @@
 /**
  * Memory efficient set data structure.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface EconomicSet<E> extends UnmodifiableEconomicSet<E> {
 
@@ -53,7 +53,7 @@
      * Adds {@code element} to this set if it is not already present.
      *
      * @return {@code true} if this set did not already contain {@code element}.
-     * @since 1.0
+     * @since 19.0
      */
     boolean add(E element);
 
@@ -61,21 +61,21 @@
      * Removes {@code element} from this set if it is present. This set will not contain
      * {@code element} once the call returns.
      *
-     * @since 1.0
+     * @since 19.0
      */
     void remove(E element);
 
     /**
      * Removes all of the elements from this set. The set will be empty after this call returns.
      *
-     * @since 1.0
+     * @since 19.0
      */
     void clear();
 
     /**
      * Adds all of the elements in {@code other} to this set if they're not already present.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void addAll(EconomicSet<E> other) {
         addAll(other.iterator());
@@ -84,7 +84,7 @@
     /**
      * Adds all of the elements in {@code values} to this set if they're not already present.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void addAll(Iterable<E> values) {
         addAll(values.iterator());
@@ -94,7 +94,7 @@
      * Adds all of the elements enumerated by {@code iterator} to this set if they're not already
      * present.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void addAll(Iterator<E> iterator) {
         while (iterator.hasNext()) {
@@ -105,7 +105,7 @@
     /**
      * Removes from this set all of its elements that are contained in {@code other}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void removeAll(EconomicSet<E> other) {
         removeAll(other.iterator());
@@ -114,7 +114,7 @@
     /**
      * Removes from this set all of its elements that are contained in {@code values}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void removeAll(Iterable<E> values) {
         removeAll(values.iterator());
@@ -123,7 +123,7 @@
     /**
      * Removes from this set all of its elements that are enumerated by {@code iterator}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void removeAll(Iterator<E> iterator) {
         while (iterator.hasNext()) {
@@ -134,7 +134,7 @@
     /**
      * Removes from this set all of its elements that are not contained in {@code other}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default void retainAll(EconomicSet<E> other) {
         Iterator<E> iterator = iterator();
@@ -150,7 +150,7 @@
      * Creates a new set guaranteeing insertion order when iterating over its elements with the
      * default {@link Equivalence#DEFAULT} comparison strategy.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <E> EconomicSet<E> create() {
         return EconomicSet.create(Equivalence.DEFAULT);
@@ -159,7 +159,7 @@
     /**
      * Creates a new set guaranteeing insertion order when iterating over its elements.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <E> EconomicSet<E> create(Equivalence strategy) {
         return EconomicMapImpl.create(strategy, true);
@@ -170,7 +170,7 @@
      * default {@link Equivalence#DEFAULT} comparison strategy and inserts all elements of the
      * specified collection.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <E> EconomicSet<E> create(int initialCapacity) {
         return EconomicSet.create(Equivalence.DEFAULT, initialCapacity);
@@ -181,7 +181,7 @@
      * default {@link Equivalence#DEFAULT} comparison strategy and inserts all elements of the
      * specified collection.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <E> EconomicSet<E> create(UnmodifiableEconomicSet<E> c) {
         return EconomicSet.create(Equivalence.DEFAULT, c);
@@ -191,7 +191,7 @@
      * Creates a new set guaranteeing insertion order when iterating over its elements and
      * initializes with the given capacity.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <E> EconomicSet<E> create(Equivalence strategy, int initialCapacity) {
         return EconomicMapImpl.create(strategy, initialCapacity, true);
@@ -201,7 +201,7 @@
      * Creates a new set guaranteeing insertion order when iterating over its elements and inserts
      * all elements of the specified collection.
      *
-     * @since 1.0
+     * @since 19.0
      */
     static <E> EconomicSet<E> create(Equivalence strategy, UnmodifiableEconomicSet<E> c) {
         return EconomicMapImpl.create(strategy, c, true);

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Equivalence.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Equivalence.java	Thu Jun 27 03:33:44 2019 +0200
@@ -44,7 +44,7 @@
  * Strategy for comparing two objects. Default predefined strategies are {@link #DEFAULT},
  * {@link #IDENTITY}, and {@link #IDENTITY_WITH_SYSTEM_HASHCODE}.
  *
- * @since 1.0
+ * @since 19.0
  */
 public abstract class Equivalence {
 
@@ -53,7 +53,7 @@
      * for obtaining hash values. Do not change the logic of this class as it may be inlined in
      * other places.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public static final Equivalence DEFAULT = new Equivalence() {
 
@@ -72,7 +72,7 @@
      * Identity equivalence using {@code ==} to check equality and {@link #hashCode()} for obtaining
      * hash values. Do not change the logic of this class as it may be inlined in other places.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public static final Equivalence IDENTITY = new Equivalence() {
 
@@ -92,7 +92,7 @@
      * {@link System#identityHashCode(Object)} for obtaining hash values. Do not change the logic of
      * this class as it may be inlined in other places.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public static final Equivalence IDENTITY_WITH_SYSTEM_HASHCODE = new Equivalence() {
 
@@ -110,7 +110,7 @@
     /**
      * Subclass for creating custom equivalence definitions.
      *
-     * @since 1.0
+     * @since 19.0
      */
     protected Equivalence() {
     }
@@ -119,14 +119,14 @@
      * Returns {@code true} if the non-{@code null} arguments are equal to each other and
      * {@code false} otherwise.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public abstract boolean equals(Object a, Object b);
 
     /**
      * Returns the hash code of a non-{@code null} argument {@code o}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public abstract int hashCode(Object o);
 }

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/MapCursor.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/MapCursor.java	Thu Jun 27 03:33:44 2019 +0200
@@ -43,7 +43,7 @@
 /**
  * Cursor to iterate over a mutable map.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface MapCursor<K, V> extends UnmodifiableMapCursor<K, V> {
     /**
@@ -51,7 +51,7 @@
      * {@link #remove()}, it is no longer valid to call {@link #getKey()} or {@link #getValue()} on
      * the current entry.
      *
-     * @since 1.0
+     * @since 19.0
      */
     void remove();
 }

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Pair.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Pair.java	Thu Jun 27 03:33:44 2019 +0200
@@ -45,7 +45,7 @@
 /**
  * Utility class representing a pair of values.
  *
- * @since 1.0
+ * @since 19.0
  */
 public final class Pair<L, R> {
 
@@ -57,7 +57,7 @@
     /**
      * Returns an empty pair.
      *
-     * @since 1.0
+     * @since 19.0
      */
     @SuppressWarnings("unchecked")
     public static <L, R> Pair<L, R> empty() {
@@ -69,7 +69,7 @@
      * {@code left} is null.
      *
      * @return the constructed pair or an empty pair if {@code left} is null.
-     * @since 1.0
+     * @since 19.0
      */
     public static <L, R> Pair<L, R> createLeft(L left) {
         if (left == null) {
@@ -84,7 +84,7 @@
      * {@code right} is null.
      *
      * @return the constructed pair or an empty pair if {@code right} is null.
-     * @since 1.0
+     * @since 19.0
      */
     public static <L, R> Pair<L, R> createRight(R right) {
         if (right == null) {
@@ -99,7 +99,7 @@
      * {@code right}, or returns an empty pair if both inputs are null.
      *
      * @return the constructed pair or an empty pair if both inputs are null.
-     * @since 1.0
+     * @since 19.0
      */
     public static <L, R> Pair<L, R> create(L left, R right) {
         if (right == null && left == null) {
@@ -117,7 +117,7 @@
     /**
      * Returns the left value of this pair.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public L getLeft() {
         return left;
@@ -126,7 +126,7 @@
     /**
      * Returns the right value of this pair.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public R getRight() {
         return right;
@@ -135,7 +135,7 @@
     /**
      * {@inheritDoc}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     public int hashCode() {
@@ -145,7 +145,7 @@
     /**
      * {@inheritDoc}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @SuppressWarnings("unchecked")
     @Override
@@ -165,7 +165,7 @@
     /**
      * {@inheritDoc}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     public String toString() {

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java	Thu Jun 27 03:33:44 2019 +0200
@@ -43,7 +43,7 @@
 /**
  * Unmodifiable memory efficient map data structure.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface UnmodifiableEconomicMap<K, V> {
 
@@ -51,7 +51,7 @@
      * Returns the value to which {@code key} is mapped, or {@code null} if this map contains no
      * mapping for {@code key}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     V get(K key);
 
@@ -59,7 +59,7 @@
      * Returns the value to which {@code key} is mapped, or {@code defaultValue} if this map
      * contains no mapping for {@code key}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     default V get(K key, V defaultValue) {
         V v = get(key);
@@ -72,42 +72,42 @@
     /**
      * Returns {@code true} if this map contains a mapping for {@code key}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean containsKey(K key);
 
     /**
      * Returns the number of key-value mappings in this map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     int size();
 
     /**
      * Returns {@code true} if this map contains no key-value mappings.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean isEmpty();
 
     /**
      * Returns a {@link Iterable} view of the values contained in this map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     Iterable<V> getValues();
 
     /**
      * Returns a {@link Iterable} view of the keys contained in this map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     Iterable<K> getKeys();
 
     /**
      * Returns a {@link UnmodifiableMapCursor} view of the mappings contained in this map.
      *
-     * @since 1.0
+     * @since 19.0
      */
     UnmodifiableMapCursor<K, V> getEntries();
 }

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicSet.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicSet.java	Thu Jun 27 03:33:44 2019 +0200
@@ -43,28 +43,28 @@
 /**
  * Unmodifiable memory efficient set data structure.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface UnmodifiableEconomicSet<E> extends Iterable<E> {
 
     /**
      * Returns {@code true} if this set contains a mapping for the {@code element}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean contains(E element);
 
     /**
      * Returns the number of elements in this set.
      *
-     * @since 1.0
+     * @since 19.0
      */
     int size();
 
     /**
      * Returns {@code true} if this set contains no elements.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean isEmpty();
 
@@ -76,7 +76,7 @@
      * @return an array containing all the elements in this set.
      * @throws UnsupportedOperationException if the length of {@code target} does not equal the size
      *             of this set.
-     * @since 1.0
+     * @since 19.0
      */
     default E[] toArray(E[] target) {
         if (target.length != size()) {

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableMapCursor.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableMapCursor.java	Thu Jun 27 03:33:44 2019 +0200
@@ -43,28 +43,28 @@
 /**
  * Cursor to iterate over a map without changing its contents.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface UnmodifiableMapCursor<K, V> {
     /**
      * Advances to the next entry.
      *
      * @return {@code true} if a next entry exists, {@code false} if there is no next entry.
-     * @since 1.0
+     * @since 19.0
      */
     boolean advance();
 
     /**
      * The key of the current entry.
      *
-     * @since 1.0
+     * @since 19.0
      */
     K getKey();
 
     /**
      * The value of the current entry.
      *
-     * @since 1.0
+     * @since 19.0
      */
     V getValue();
 }

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/package-info.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/package-info.java	Thu Jun 27 03:33:44 2019 +0200
@@ -31,7 +31,7 @@
  * @see jdk.internal.vm.compiler.collections.EconomicMap
  * @see jdk.internal.vm.compiler.collections.EconomicSet
  *
- * @since 1.0
+ * @since 19.0
  */
 
 

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraal.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraal.java	Thu Jun 27 03:33:44 2019 +0200
@@ -33,67 +33,43 @@
 public class LibGraal {
 
     public static boolean isAvailable() {
-        return isCurrentRuntime() || libgraalIsolate != 0L;
+        return inLibGraal() || isolate != 0L;
     }
 
-    public static boolean isCurrentRuntime() {
+    public static boolean inLibGraal() {
         return Services.IS_IN_NATIVE_IMAGE;
     }
 
-    public static long getIsolate() {
-        if (isCurrentRuntime() || !isAvailable()) {
-            throw new IllegalStateException();
-        }
-        return libgraalIsolate;
-    }
-
-    public static long getIsolateThread() {
-        if (isCurrentRuntime()) {
-            throw new IllegalStateException();
-        }
-        return CURRENT_ISOLATE_THREAD.get();
-    }
-
-    @SuppressWarnings("unused")
-    public static long[] registerNativeMethods(HotSpotJVMCIRuntime runtime, Class<?> clazz) {
+    public static void registerNativeMethods(HotSpotJVMCIRuntime runtime, Class<?> clazz) {
         if (clazz.isPrimitive()) {
             throw new IllegalArgumentException();
         }
-        if (isCurrentRuntime() || !isAvailable()) {
+        if (inLibGraal() || !isAvailable()) {
             throw new IllegalStateException();
         }
-        // Waiting for https://bugs.openjdk.java.net/browse/JDK-8220623
-        // return runtime.registerNativeMethods(clazz);
-        throw new IllegalStateException("Requires JDK-8220623");
+        runtime.registerNativeMethods(clazz);
     }
 
-    @SuppressWarnings("unused")
     public static long translate(HotSpotJVMCIRuntime runtime, Object obj) {
         if (!isAvailable()) {
             throw new IllegalStateException();
         }
-        // return runtime.translate(obj);
-        throw new IllegalStateException("Requires JDK-8220623");
+        if (!inLibGraal() && LibGraalScope.currentScope.get() == null) {
+            throw new IllegalStateException("Not within a " + LibGraalScope.class.getName());
+        }
+        return runtime.translate(obj);
     }
 
-    @SuppressWarnings("unused")
     public static <T> T unhand(HotSpotJVMCIRuntime runtime, Class<T> type, long handle) {
         if (!isAvailable()) {
             throw new IllegalStateException();
         }
-        // return runtime.unhand(type, handle);
-        throw new IllegalStateException("Requires JDK-8220623");
+        if (!inLibGraal() && LibGraalScope.currentScope.get() == null) {
+            throw new IllegalStateException("Not within a " + LibGraalScope.class.getName());
+        }
+        return runtime.unhand(type, handle);
     }
 
-    private static final ThreadLocal<Long> CURRENT_ISOLATE_THREAD = new ThreadLocal<>() {
-        @Override
-        protected Long initialValue() {
-            return attachThread(libgraalIsolate);
-        }
-    };
-
-    private static final long libgraalIsolate = Services.IS_BUILDING_NATIVE_IMAGE ? 0L : initializeLibgraal();
-
     private static long initializeLibgraal() {
         try {
             // Initialize JVMCI to ensure JVMCI opens its packages to
@@ -101,20 +77,27 @@
             // below will fail on JDK13+.
             Services.initializeJVMCI();
 
-            // Waiting for https://bugs.openjdk.java.net/browse/JDK-8220623
-            // HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime();
-            // long[] nativeInterface = runtime.registerNativeMethods(LibGraal.class);
-            // return nativeInterface[1];
-            return 0L;
+            HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime();
+            long[] nativeInterface = runtime.registerNativeMethods(LibGraal.class);
+            return nativeInterface[1];
         } catch (UnsupportedOperationException e) {
             return 0L;
         }
     }
 
-    /**
-     * Attaches the current thread to a thread in {@code isolate}.
-     *
-     * @param isolate
-     */
-    private static native long attachThread(long isolate);
+    static final long isolate = Services.IS_BUILDING_NATIVE_IMAGE ? 0L : initializeLibgraal();
+
+    static boolean isCurrentThreadAttached(HotSpotJVMCIRuntime runtime) {
+        return runtime.isCurrentThreadAttached();
+    }
+
+    static boolean attachCurrentThread(HotSpotJVMCIRuntime runtime) {
+        return runtime.attachCurrentThread(false);
+    }
+
+    static void detachCurrentThread(HotSpotJVMCIRuntime runtime) {
+        runtime.detachCurrentThread();
+    }
+
+    static native long getCurrentIsolateThread(long iso);
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/LibGraalScope.java	Thu Jun 27 03:33:44 2019 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2019, 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.
+ */
+
+
+package jdk.internal.vm.compiler.libgraal;
+
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+
+/**
+ * Scope for calling CEntryPoints in libgraal. {@linkplain #LibGraalScope(HotSpotJVMCIRuntime)
+ * Opening} a scope attaches the current thread to libgraal and {@linkplain #close() closing} it
+ * detaches the current thread.
+ */
+public final class LibGraalScope implements AutoCloseable {
+
+    static final ThreadLocal<LibGraalScope> currentScope = new ThreadLocal<>();
+
+    private final LibGraalScope parent;
+    private final boolean topLevel;
+    private final HotSpotJVMCIRuntime runtime;
+    private final long isolateThread;
+
+    /**
+     * Gets the isolate thread associated with the current thread. The current thread must be in an
+     * {@linkplain #LibGraalScope(HotSpotJVMCIRuntime) opened} scope.
+     *
+     * @returns a value that can be used for the IsolateThreadContext argument of a {@code native}
+     *          method {@link LibGraal#registerNativeMethods linked} to a CEntryPoint function in
+     *          libgraal
+     * @throws IllegalStateException if not the current thread is not attached to libgraal
+     */
+    public static long getIsolateThread() {
+        LibGraalScope scope = currentScope.get();
+        if (scope == null) {
+            throw new IllegalStateException("Cannot get isolate thread outside of a " + LibGraalScope.class.getSimpleName());
+        }
+        return scope.isolateThread;
+    }
+
+    /**
+     * Enters a scope for making calls into libgraal. If there is no existing libgraal scope for the
+     * current thread, the current thread is attached to libgraal. When the outer most scope is
+     * closed, the current thread is detached from libgraal.
+     *
+     * This must be used in a try-with-resources statement.
+     *
+     * This cannot be called from {@linkplain LibGraal#inLibGraal() within} libgraal.
+     *
+     * @throws IllegalStateException if libgraal is {@linkplain LibGraal#isAvailable() unavailable}
+     *             or {@link LibGraal#inLibGraal()} returns true
+     */
+    public LibGraalScope(HotSpotJVMCIRuntime runtime) {
+        if (LibGraal.inLibGraal() || !LibGraal.isAvailable()) {
+            throw new IllegalStateException();
+        }
+        this.runtime = runtime;
+        parent = currentScope.get();
+        boolean top = false;
+        if (parent == null) {
+            top = LibGraal.attachCurrentThread(runtime);
+            isolateThread = LibGraal.getCurrentIsolateThread(LibGraal.isolate);
+        } else {
+            isolateThread = parent.isolateThread;
+        }
+        topLevel = top;
+        currentScope.set(this);
+    }
+
+    @Override
+    public void close() {
+        if (topLevel) {
+            LibGraal.detachCurrentThread(runtime);
+        }
+        currentScope.set(parent);
+    }
+}

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/OptionsEncoder.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.libgraal/src/jdk/internal/vm/compiler/libgraal/OptionsEncoder.java	Thu Jun 27 03:33:44 2019 +0200
@@ -162,6 +162,9 @@
                 }
                 res.put(key, value);
             }
+            if (in.available() != 0) {
+                throw new IllegalArgumentException(in.available() + " undecoded bytes");
+            }
         } catch (IOException ioe) {
             throw new IllegalArgumentException(ioe);
         }

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/ComparableWord.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/ComparableWord.java	Thu Jun 27 03:33:44 2019 +0200
@@ -43,7 +43,7 @@
 /**
  * A machine-word-sized value that can be compared for equality.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface ComparableWord extends WordBase {
 
@@ -53,7 +53,7 @@
      * @param val value to which this word is to be compared.
      * @return {@code this == val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean equal(ComparableWord val);
 
@@ -63,7 +63,7 @@
      * @param val value to which this word is to be compared.
      * @return {@code this != val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean notEqual(ComparableWord val);
 }

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/LocationIdentity.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/LocationIdentity.java	Thu Jun 27 03:33:44 2019 +0200
@@ -50,7 +50,7 @@
  * comparing two {@link LocationIdentity} values for equality. Likewise, they must not use
  * {@link java.util.IdentityHashMap}s with {@link LocationIdentity} values as keys.
  *
- * @since 1.0
+ * @since 19.0
  */
 public abstract class LocationIdentity {
 
@@ -82,7 +82,7 @@
      * Creates a new location identity. Subclasses are responsible to provide proper implementations
      * of {@link #equals} and {@link #hashCode}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     protected LocationIdentity() {
     }
@@ -92,7 +92,7 @@
      * such a location kill all reads from mutable locations and a read from this location is killed
      * by any write (except for initialization writes).
      *
-     * @since 1.0
+     * @since 19.0
      */
     public static final LocationIdentity ANY_LOCATION = new AnyLocationIdentity();
 
@@ -101,7 +101,7 @@
      * is written. Kills no read. The previous value at the given location must be either
      * uninitialized or null. Writes to this location do not need a GC pre-barrier.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public static final LocationIdentity INIT_LOCATION = new InitLocationIdentity();
 
@@ -110,7 +110,7 @@
      * such a location kill all reads from mutable locations and a read from this location is killed
      * by any write (except for initialization writes).
      *
-     * @since 1.0
+     * @since 19.0
      */
     public static LocationIdentity any() {
         return ANY_LOCATION;
@@ -121,7 +121,7 @@
      * is written. Kills no read. The previous value at the given location must be either
      * uninitialized or null. Writes to this location do not need a GC pre-barrier.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public static LocationIdentity init() {
         return INIT_LOCATION;
@@ -131,14 +131,14 @@
      * Denotes a location is unchanging in all cases. Not that this is different than the Java
      * notion of final which only requires definite assignment.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public abstract boolean isImmutable();
 
     /**
      * The inversion of {@link #isImmutable}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public final boolean isMutable() {
         return !isImmutable();
@@ -147,7 +147,7 @@
     /**
      * Returns true if this location identity is {@link #any}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public final boolean isAny() {
         return this == ANY_LOCATION;
@@ -156,7 +156,7 @@
     /**
      * Returns true if this location identity is {@link #init}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public final boolean isInit() {
         return this == INIT_LOCATION;
@@ -165,7 +165,7 @@
     /**
      * Returns true if this location identity is not {@link #any}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public final boolean isSingle() {
         return this != ANY_LOCATION;
@@ -175,7 +175,7 @@
      * Returns true if the memory slice denoted by this location identity may overlap with the
      * provided other location identity.
      *
-     * @since 1.0
+     * @since 19.0
      */
     public final boolean overlaps(LocationIdentity other) {
         return isAny() || other.isAny() || this.equals(other);

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/Pointer.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/Pointer.java	Thu Jun 27 03:33:44 2019 +0200
@@ -47,7 +47,7 @@
  * null checks, read- or write barriers. Even when the VM uses compressed pointers, then readObject
  * and writeObject methods access uncompressed pointers.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface Pointer extends UnsignedWord, PointerBase {
 
@@ -58,7 +58,7 @@
      *
      * @return this Pointer cast to Object.
      *
-     * @since 1.0
+     * @since 19.0
      */
     Object toObject();
 
@@ -69,7 +69,7 @@
      *
      * @return this Pointer cast to non-null Object.
      *
-     * @since 1.0
+     * @since 19.0
      */
     Object toObjectNonNull();
 
@@ -85,7 +85,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     byte readByte(WordBase offset, LocationIdentity locationIdentity);
 
@@ -101,7 +101,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     char readChar(WordBase offset, LocationIdentity locationIdentity);
 
@@ -117,7 +117,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     short readShort(WordBase offset, LocationIdentity locationIdentity);
 
@@ -133,7 +133,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     int readInt(WordBase offset, LocationIdentity locationIdentity);
 
@@ -149,7 +149,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     long readLong(WordBase offset, LocationIdentity locationIdentity);
 
@@ -165,7 +165,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     float readFloat(WordBase offset, LocationIdentity locationIdentity);
 
@@ -181,7 +181,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     double readDouble(WordBase offset, LocationIdentity locationIdentity);
 
@@ -197,7 +197,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     <T extends WordBase> T readWord(WordBase offset, LocationIdentity locationIdentity);
 
@@ -213,7 +213,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     Object readObject(WordBase offset, LocationIdentity locationIdentity);
 
@@ -225,7 +225,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     byte readByte(int offset, LocationIdentity locationIdentity);
 
@@ -237,7 +237,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     char readChar(int offset, LocationIdentity locationIdentity);
 
@@ -249,7 +249,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     short readShort(int offset, LocationIdentity locationIdentity);
 
@@ -261,7 +261,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     int readInt(int offset, LocationIdentity locationIdentity);
 
@@ -273,7 +273,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     long readLong(int offset, LocationIdentity locationIdentity);
 
@@ -285,7 +285,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     float readFloat(int offset, LocationIdentity locationIdentity);
 
@@ -297,7 +297,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     double readDouble(int offset, LocationIdentity locationIdentity);
 
@@ -309,7 +309,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     <T extends WordBase> T readWord(int offset, LocationIdentity locationIdentity);
 
@@ -321,7 +321,7 @@
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     Object readObject(int offset, LocationIdentity locationIdentity);
 
@@ -337,7 +337,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeByte(WordBase offset, byte val, LocationIdentity locationIdentity);
 
@@ -353,7 +353,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeChar(WordBase offset, char val, LocationIdentity locationIdentity);
 
@@ -369,7 +369,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeShort(WordBase offset, short val, LocationIdentity locationIdentity);
 
@@ -385,7 +385,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeInt(WordBase offset, int val, LocationIdentity locationIdentity);
 
@@ -401,7 +401,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeLong(WordBase offset, long val, LocationIdentity locationIdentity);
 
@@ -417,7 +417,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeFloat(WordBase offset, float val, LocationIdentity locationIdentity);
 
@@ -433,7 +433,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeDouble(WordBase offset, double val, LocationIdentity locationIdentity);
 
@@ -449,7 +449,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeWord(WordBase offset, WordBase val, LocationIdentity locationIdentity);
 
@@ -465,7 +465,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void initializeLong(WordBase offset, long val, LocationIdentity locationIdentity);
 
@@ -481,7 +481,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeObject(WordBase offset, Object val, LocationIdentity locationIdentity);
 
@@ -493,7 +493,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeByte(int offset, byte val, LocationIdentity locationIdentity);
 
@@ -505,7 +505,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeChar(int offset, char val, LocationIdentity locationIdentity);
 
@@ -517,7 +517,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeShort(int offset, short val, LocationIdentity locationIdentity);
 
@@ -529,7 +529,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeInt(int offset, int val, LocationIdentity locationIdentity);
 
@@ -541,7 +541,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeLong(int offset, long val, LocationIdentity locationIdentity);
 
@@ -553,7 +553,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeFloat(int offset, float val, LocationIdentity locationIdentity);
 
@@ -565,7 +565,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeDouble(int offset, double val, LocationIdentity locationIdentity);
 
@@ -577,7 +577,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeWord(int offset, WordBase val, LocationIdentity locationIdentity);
 
@@ -589,7 +589,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void initializeLong(int offset, long val, LocationIdentity locationIdentity);
 
@@ -601,7 +601,7 @@
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeObject(int offset, Object val, LocationIdentity locationIdentity);
 
@@ -616,7 +616,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     byte readByte(WordBase offset);
 
@@ -631,7 +631,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     char readChar(WordBase offset);
 
@@ -646,7 +646,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     short readShort(WordBase offset);
 
@@ -661,7 +661,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     int readInt(WordBase offset);
 
@@ -676,7 +676,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     long readLong(WordBase offset);
 
@@ -691,7 +691,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     float readFloat(WordBase offset);
 
@@ -706,7 +706,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     double readDouble(WordBase offset);
 
@@ -721,7 +721,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     <T extends WordBase> T readWord(WordBase offset);
 
@@ -736,7 +736,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     Object readObject(WordBase offset);
 
@@ -747,7 +747,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     byte readByte(int offset);
 
@@ -758,7 +758,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     char readChar(int offset);
 
@@ -769,7 +769,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     short readShort(int offset);
 
@@ -780,7 +780,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     int readInt(int offset);
 
@@ -791,7 +791,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     long readLong(int offset);
 
@@ -802,7 +802,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     float readFloat(int offset);
 
@@ -813,7 +813,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     double readDouble(int offset);
 
@@ -824,7 +824,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     <T extends WordBase> T readWord(int offset);
 
@@ -835,7 +835,7 @@
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      *
-     * @since 1.0
+     * @since 19.0
      */
     Object readObject(int offset);
 
@@ -850,7 +850,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeByte(WordBase offset, byte val);
 
@@ -865,7 +865,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeChar(WordBase offset, char val);
 
@@ -880,7 +880,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeShort(WordBase offset, short val);
 
@@ -895,7 +895,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeInt(WordBase offset, int val);
 
@@ -910,7 +910,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeLong(WordBase offset, long val);
 
@@ -925,7 +925,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeFloat(WordBase offset, float val);
 
@@ -940,7 +940,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeDouble(WordBase offset, double val);
 
@@ -955,7 +955,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeWord(WordBase offset, WordBase val);
 
@@ -970,7 +970,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeObject(WordBase offset, Object val);
 
@@ -990,7 +990,7 @@
      * @return The value that was read for comparison, which is {@code expectedValue} if the
      *         exchange was performed.
      *
-     * @since 1.0
+     * @since 19.0
      */
     int compareAndSwapInt(WordBase offset, int expectedValue, int newValue, LocationIdentity locationIdentity);
 
@@ -1010,7 +1010,7 @@
      * @return The value that was read for comparison, which is {@code expectedValue} if the
      *         exchange was performed.
      *
-     * @since 1.0
+     * @since 19.0
      */
     long compareAndSwapLong(WordBase offset, long expectedValue, long newValue, LocationIdentity locationIdentity);
 
@@ -1030,7 +1030,7 @@
      * @return The value that was read for comparison, which is {@code expectedValue} if the
      *         exchange was performed.
      *
-     * @since 1.0
+     * @since 19.0
      */
     <T extends WordBase> T compareAndSwapWord(WordBase offset, T expectedValue, T newValue, LocationIdentity locationIdentity);
 
@@ -1050,7 +1050,7 @@
      * @return The value that was read for comparison, which is {@code expectedValue} if the
      *         exchange was performed.
      *
-     * @since 1.0
+     * @since 19.0
      */
     Object compareAndSwapObject(WordBase offset, Object expectedValue, Object newValue, LocationIdentity locationIdentity);
 
@@ -1070,7 +1070,7 @@
      * @return {@code true} if successful. False return indicates that the actual value was not
      *         equal to the expected value.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean logicCompareAndSwapInt(WordBase offset, int expectedValue, int newValue, LocationIdentity locationIdentity);
 
@@ -1090,7 +1090,7 @@
      * @return {@code true} if successful. False return indicates that the actual value was not
      *         equal to the expected value.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean logicCompareAndSwapLong(WordBase offset, long expectedValue, long newValue, LocationIdentity locationIdentity);
 
@@ -1110,7 +1110,7 @@
      * @return {@code true} if successful. False return indicates that the actual value was not
      *         equal to the expected value.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean logicCompareAndSwapWord(WordBase offset, WordBase expectedValue, WordBase newValue, LocationIdentity locationIdentity);
 
@@ -1130,7 +1130,7 @@
      * @return {@code true} if successful. False return indicates that the actual value was not
      *         equal to the expected value.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean logicCompareAndSwapObject(WordBase offset, Object expectedValue, Object newValue, LocationIdentity locationIdentity);
 
@@ -1141,7 +1141,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeByte(int offset, byte val);
 
@@ -1152,7 +1152,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeChar(int offset, char val);
 
@@ -1163,7 +1163,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeShort(int offset, short val);
 
@@ -1174,7 +1174,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeInt(int offset, int val);
 
@@ -1185,7 +1185,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeLong(int offset, long val);
 
@@ -1196,7 +1196,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeFloat(int offset, float val);
 
@@ -1207,7 +1207,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeDouble(int offset, double val);
 
@@ -1218,7 +1218,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeWord(int offset, WordBase val);
 
@@ -1229,7 +1229,7 @@
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      *
-     * @since 1.0
+     * @since 19.0
      */
     void writeObject(int offset, Object val);
 
@@ -1245,7 +1245,7 @@
      * @return The value that was read for comparison, which is {@code expectedValue} if the
      *         exchange was performed.
      *
-     * @since 1.0
+     * @since 19.0
      */
     int compareAndSwapInt(int offset, int expectedValue, int newValue, LocationIdentity locationIdentity);
 
@@ -1261,7 +1261,7 @@
      * @return The value that was read for comparison, which is {@code expectedValue} if the
      *         exchange was performed.
      *
-     * @since 1.0
+     * @since 19.0
      */
     long compareAndSwapLong(int offset, long expectedValue, long newValue, LocationIdentity locationIdentity);
 
@@ -1277,7 +1277,7 @@
      * @return The value that was read for comparison, which is {@code expectedValue} if the
      *         exchange was performed.
      *
-     * @since 1.0
+     * @since 19.0
      */
     <T extends WordBase> T compareAndSwapWord(int offset, T expectedValue, T newValue, LocationIdentity locationIdentity);
 
@@ -1293,7 +1293,7 @@
      * @return The value that was read for comparison, which is {@code expectedValue} if the
      *         exchange was performed.
      *
-     * @since 1.0
+     * @since 19.0
      */
     Object compareAndSwapObject(int offset, Object expectedValue, Object newValue, LocationIdentity locationIdentity);
 
@@ -1309,7 +1309,7 @@
      * @return {@code true} if successful. False return indicates that the actual value was not
      *         equal to the expected value.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean logicCompareAndSwapInt(int offset, int expectedValue, int newValue, LocationIdentity locationIdentity);
 
@@ -1325,7 +1325,7 @@
      * @return {@code true} if successful. False return indicates that the actual value was not
      *         equal to the expected value.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean logicCompareAndSwapLong(int offset, long expectedValue, long newValue, LocationIdentity locationIdentity);
 
@@ -1341,7 +1341,7 @@
      * @return {@code true} if successful. False return indicates that the actual value was not
      *         equal to the expected value.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean logicCompareAndSwapWord(int offset, WordBase expectedValue, WordBase newValue, LocationIdentity locationIdentity);
 
@@ -1357,7 +1357,7 @@
      * @return {@code true} if successful. False return indicates that the actual value was not
      *         equal to the expected value.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean logicCompareAndSwapObject(int offset, Object expectedValue, Object newValue, LocationIdentity locationIdentity);
 
@@ -1371,7 +1371,7 @@
      * @param val value to be added to this Pointer.
      * @return {@code this + val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     Pointer add(UnsignedWord val);
@@ -1382,7 +1382,7 @@
      * @param val value to be added to this Pointer.
      * @return {@code this + val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     Pointer add(int val);
@@ -1393,7 +1393,7 @@
      * @param val value to be subtracted from this Pointer.
      * @return {@code this - val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     Pointer subtract(UnsignedWord val);
@@ -1404,7 +1404,7 @@
      * @param val value to be subtracted from this Pointer.
      * @return {@code this - val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     Pointer subtract(int val);
@@ -1415,7 +1415,7 @@
      * @param val value to be AND'ed with this Pointer.
      * @return {@code this & val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     Pointer and(UnsignedWord val);
@@ -1426,7 +1426,7 @@
      * @param val value to be AND'ed with this Pointer.
      * @return {@code this & val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     Pointer and(int val);
@@ -1437,7 +1437,7 @@
      * @param val value to be OR'ed with this Pointer.
      * @return {@code this | val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     Pointer or(UnsignedWord val);
@@ -1448,7 +1448,7 @@
      * @param val value to be OR'ed with this Pointer.
      * @return {@code this | val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     @Override
     Pointer or(int val);

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/PointerBase.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/PointerBase.java	Thu Jun 27 03:33:44 2019 +0200
@@ -44,21 +44,21 @@
  * Marker interface for all {@link WordBase word types} that have the semantic of a pointer (but not
  * necessarily all the memory access methods defined in {@link Pointer}).
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface PointerBase extends ComparableWord {
 
     /**
      * Returns true if this pointer is the {@link WordFactory#nullPointer null pointer}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean isNull();
 
     /**
      * Returns true if this pointer is not the {@link WordFactory#nullPointer null pointer}.
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean isNonNull();
 }

--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/SignedWord.java	Thu Jun 27 03:10:52 2019 +0200
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/SignedWord.java	Thu Jun 27 03:33:44 2019 +0200
@@ -43,7 +43,7 @@
 /**
  * Represents a signed word-sized value.
  *
- * @since 1.0
+ * @since 19.0
  */
 public interface SignedWord extends ComparableWord {
 
@@ -53,7 +53,7 @@
      * @param val value to be added to this Signed.
      * @return {@code this + val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord add(SignedWord val);
 
@@ -63,7 +63,7 @@
      * @param val value to be subtracted from this Signed.
      * @return {@code this - val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord subtract(SignedWord val);
 
@@ -73,7 +73,7 @@
      * @param val value to be multiplied by this Signed.
      * @return {@code this * val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord multiply(SignedWord val);
 
@@ -83,7 +83,7 @@
      * @param val value by which this Signed is to be divided.
      * @return {@code this / val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord signedDivide(SignedWord val);
 
@@ -93,7 +93,7 @@
      * @param val value by which this Signed is to be divided, and the remainder computed.
      * @return {@code this % val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord signedRemainder(SignedWord val);
 
@@ -103,7 +103,7 @@
      * @param n shift distance, in bits.
      * @return {@code this << n}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord shiftLeft(UnsignedWord n);
 
@@ -113,7 +113,7 @@
      * @param n shift distance, in bits.
      * @return {@code this >> n}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord signedShiftRight(UnsignedWord n);
 
@@ -124,7 +124,7 @@
      * @param val value to be AND'ed with this Signed.
      * @return {@code this & val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord and(SignedWord val);
 
@@ -135,7 +135,7 @@
      * @param val value to be OR'ed with this Signed.
      * @return {@code this | val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord or(SignedWord val);
 
@@ -146,7 +146,7 @@
      * @param val value to be XOR'ed with this Signed.
      * @return {@code this ^ val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord xor(SignedWord val);
 
@@ -156,7 +156,7 @@
      *
      * @return {@code ~this}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord not();
 
@@ -166,7 +166,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this == val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean equal(SignedWord val);
 
@@ -176,7 +176,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this != val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean notEqual(SignedWord val);
 
@@ -186,7 +186,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this < val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean lessThan(SignedWord val);
 
@@ -196,7 +196,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this <= val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean lessOrEqual(SignedWord val);
 
@@ -206,7 +206,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this > val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean greaterThan(SignedWord val);
 
@@ -216,7 +216,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this >= val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean greaterOrEqual(SignedWord val);
 
@@ -226,7 +226,7 @@
      * @param val value to be added to this Signed.
      * @return {@code this + val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord add(int val);
 
@@ -236,7 +236,7 @@
      * @param val value to be subtracted from this Signed.
      * @return {@code this - val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord subtract(int val);
 
@@ -246,7 +246,7 @@
      * @param val value to be multiplied by this Signed.
      * @return {@code this * val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord multiply(int val);
 
@@ -256,7 +256,7 @@
      * @param val value by which this Signed is to be divided.
      * @return {@code this / val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord signedDivide(int val);
 
@@ -266,7 +266,7 @@
      * @param val value by which this Signed is to be divided, and the remainder computed.
      * @return {@code this % val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord signedRemainder(int val);
 
@@ -276,7 +276,7 @@
      * @param n shift distance, in bits.
      * @return {@code this << n}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord shiftLeft(int n);
 
@@ -286,7 +286,7 @@
      * @param n shift distance, in bits.
      * @return {@code this >> n}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord signedShiftRight(int n);
 
@@ -297,7 +297,7 @@
      * @param val value to be AND'ed with this Signed.
      * @return {@code this & val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord and(int val);
 
@@ -308,7 +308,7 @@
      * @param val value to be OR'ed with this Signed.
      * @return {@code this | val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord or(int val);
 
@@ -319,7 +319,7 @@
      * @param val value to be XOR'ed with this Signed.
      * @return {@code this ^ val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     SignedWord xor(int val);
 
@@ -329,7 +329,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this == val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean equal(int val);
 
@@ -339,7 +339,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this != val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean notEqual(int val);
 
@@ -349,7 +349,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this < val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean lessThan(int val);
 
@@ -359,7 +359,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this <= val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean lessOrEqual(int val);
 
@@ -369,7 +369,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this > val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean greaterThan(int val);
 
@@ -379,7 +379,7 @@
      * @param val value to which this Signed is to be compared.
      * @return {@code this >= val}
      *
-     * @since 1.0
+     * @since 19.0
      */
     boolean greaterOrEqual(int val);
 }