Inline xLiteralPattern

Author: OlivierBlanvillain

compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala

@@ -315,9 +315,11 @@ object MarkupParsers {
     }
 
     /** Some try/catch/finally logic used by xLiteral and xLiteralPattern.  */
-    private def xLiteralCommon(f: () => Tree, ifTruncated: String => Unit): Tree = {
-      try return f()
-      catch {
+    @inline private def xLiteralCommon(f: () => Tree, ifTruncated: String => Unit): Tree = {
+      var result: Tree = null
+      try {
+        result = f()
+      } catch {
         case c @ TruncatedXMLControl  =>
           ifTruncated(c.getMessage)
         case c @ (MissingEndTagControl | ConfusedAboutBracesControl) =>
@@ -327,7 +329,10 @@ object MarkupParsers {
       }
       finally parser.in resume Tokens.XMLSTART
 
-      parser.errorTermTree
+      if (result == null)
+        parser.errorTermTree
+      else
+        result
     }
 
     /** Use a lookahead parser to run speculative body, and return the first char afterward. */