Fix ShenandoahConstants.java (and an unrelated build issue that was fixed upstream with oracle#12373)

Author: simonis

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -2994,7 +2994,7 @@ def base_jdk_version_info():
         if version_type == 'vendor':
             graalvm_suffix = ''
             if java_pre:
-                graalvm_suffix += '.' if graalvm_version.endsWith('dev') else '-'
+                graalvm_suffix += '.' if graalvm_version.endswith('dev') else '-'
                 graalvm_suffix += java_pre
         else:
             assert version_type == 'base-dir', version_type

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/gc/shenandoah/ShenandoahConstants.java

@@ -40,10 +40,10 @@
  * an array of values (i.e., one value per debug-level).
  */
 public class ShenandoahConstants {
-    private static final int TLAB_TOP_OFFSET = 104;
-    private static final int TLAB_END_OFFSET = 120;
+    private static final int TLAB_TOP_OFFSET = 384;
+    private static final int TLAB_END_OFFSET = 400;
     private static final byte DIRTY_CARD_VALUE = 0;
-    private static final int[] JAVA_THREAD_SIZE = {280, 312, 312};
+    private static final int[] JAVA_THREAD_SIZE = {560, 592, 592}; // product, fastdebug, debug
 
     @Fold
     public static int tlabTopOffset() {