Checking label lists for labels

Author: yullin-ms

lib/Parser/Parse.cpp

@@ -10509,12 +10509,24 @@ ParseNodePtr Parser::ParseStatement()
             else
             {
                 this->GetScanner()->Scan();
+                // Check if label is found within the current label id list.
+                for (LabelId* pLabelId = pLabelIdList; pLabelId; pLabelId = pLabelId->next) 
+                {
+                    if (pid == pLabelId->pid)
+                    {
+                        if (fnop == fnopContinue &&
+                            !(ParseNode::Grfnop(m_pstmtCur->op) & fnop)) 
+                        {
+                            Error(ERRbadContinue);
+                        }
+                        goto LNeedTerminator;
+                    }
+                }
                 for (pstmt = m_pstmtCur; pstmt; pstmt = pstmt->pstmtOuter)
                 {
                     LabelId* pLabelId;
                     for (pLabelId = pstmt->pLabelId; pLabelId; pLabelId = pLabelId->next)
                     {
-
                         if (pid == pLabelId->pid)
                         {
                             // Found the label. Make sure we can use it. We can

test/Basics/Labels.js

@@ -338,6 +338,21 @@ testNoSyntaxErrorWithDanglingStaticAfterLabel=
 testRuntimeErrorWithDanglingStaticAfterLabel=
     `L: static
     x = 0`
+
+testSyntaxErrorWithContinueAfterLabel=
+    `function fn() {
+        L:
+            continue L;
+    }
+    fn1()`
+
+testReferenceErrorWithBreakAfterLabel=
+    `function fn() {
+        L:
+            break L;
+    }
+    fn1()`
+
 
 function testModuleScript(source, message, shouldFail = false) {
     let testfunc = () => testRunner.LoadModule(source, 'samethread', shouldFail);
@@ -467,6 +482,8 @@ var tests = [
             assert.throws(() => eval(testRuntimeErrorWithDanglingAwaitAfterLabel), ReferenceError, "Expected reference error from stranded await being used after label", "'await' is not defined")
             assert.throws(() => eval(testRuntimeErrorWithDanglingStaticAfterLabel), ReferenceError, "Expected reference error from stranded static being used after label", "'static' is not defined")
             assert.doesNotThrow(() => eval(testNoSyntaxErrorWithDanglingStaticAfterLabel), "Expected no issue parsing since static is viewed as an identifier")
+            assert.throws(() => eval(testSyntaxErrorWithContinueAfterLabel), SyntaxError, "Expected syntax error from having continue outside of loop", "Can't have 'continue' outside of loop")
+            assert.throws(() => eval(testReferenceErrorWithBreakAfterLabel), ReferenceError, "Expected reference error from fn1 not being defined", "'fn1' is not defined")
         }
     }
 ];