Fix @LayerVerifiedOption custom message handling

Author: olpaw

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -1066,7 +1066,7 @@ public static int codeAlignment() {
     private static final String ENABLE_DEBUGINFO_OPTION = "-g";
     // Only raise error if -g is used in current layer build but missing in the previous layer build
     @LayerVerifiedOption(apiOption = ENABLE_DEBUGINFO_OPTION, kind = Kind.Added, severity = Severity.Error, message = "If you want to use " + ENABLE_DEBUGINFO_OPTION +
-                    " in this layer, use a layer that was also built with " + ENABLE_DEBUGINFO_OPTION)//
+                    " in this layer, use a base layer that also got built with " + ENABLE_DEBUGINFO_OPTION + ".")//
     // ... but use stricter check for raw (non-API) use of GenerateDebugInfo
     @LayerVerifiedOption(kind = Kind.Changed, severity = Severity.Error)//
     @APIOption(name = ENABLE_DEBUGINFO_OPTION, fixedValue = "2", customHelp = "generate debugging information")//

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/LoadLayerArchiveSupport.java

@@ -158,18 +158,16 @@ private static boolean verifyCompatibility(List<String> previousArgs, List<Strin
                                     case Added -> "Current layer gets";
                                     case Equal -> throw VMError.shouldNotReachHere("diff for equal");
                                 } + " built with option argument '" + argument + "' from " + OptionOrigin.from(argumentOrigin.origin) + ".";
-                                String suffix;
                                 if (!request.message().isEmpty()) {
-                                    suffix = request.message();
+                                    message += " " + request.message();
                                 } else {
                                     /* fallback to generic verification message */
-                                    suffix = "This is also required to be specified for the " + switch (diffResultKind) {
+                                    message += " This is also required to be specified for the " + switch (diffResultKind) {
                                         case Removed -> "current layered image build";
                                         case Added -> "previous layer build";
                                         case Equal -> throw VMError.shouldNotReachHere("diff for equal");
-                                    };
+                                    } + (positional ? " at the same position." : ".");
                                 }
-                                message += " " + suffix + (positional ? " at the same position." : ".");
                                 Severity severity = request.severity();
                                 violations.put(diffResult, severity);
                                 if (verbose) {