Fix hackc crash when using locals in constants

Reviewed By: vassilmladenov

Differential Revision: D95073805

fbshipit-source-id: cd325b2dc98dc8771200b3d1be94a6d3f3f04147

Author: WizKid

hphp/hack/src/parser/rust_parser_errors.rs

@@ -4737,7 +4737,12 @@ impl<'a, State: 'a + Clone> ParserErrors<'a, State> {
                 .for_each(|x| self_.check_constant_expression(x, static_allowed))
         };
         match &node.children {
-            Missing | QualifiedName(_) | LiteralExpression(_) => {}
+            Missing | QualifiedName(_) => {}
+            LiteralExpression(y) => {
+                if let SyntaxList(_) = &y.expression.children {
+                    default(self)
+                }
+            }
             Token(token) => {
                 if !is_namey(self, token) {
                     default(self)
@@ -4799,20 +4804,7 @@ impl<'a, State: 'a + Clone> ParserErrors<'a, State> {
                 self.check_constant_expression(&x.consequence, static_allowed);
                 self.check_constant_expression(&x.alternative, static_allowed);
             }
-            SimpleInitializer(x) => {
-                if let LiteralExpression(y) = &x.value.children {
-                    if let SyntaxList(_) = &y.expression.children {
-                        self.errors.push(make_error_from_node(
-                            node,
-                            errors::invalid_constant_initializer,
-                        ))
-                    }
-                    self.check_constant_expression(&x.value, static_allowed)
-                } else {
-                    self.check_constant_expression(&x.value, static_allowed)
-                }
-            }
-
+            SimpleInitializer(x) => self.check_constant_expression(&x.value, static_allowed),
             ParenthesizedExpression(x) => {
                 self.check_constant_expression(&x.expression, static_allowed)
             }

hphp/hack/test/full_fidelity/cases/function_default_args/list_expression.php.errors.exp

@@ -1,3 +1,3 @@
-(6,20)-(6,31) Expected constant expression for initializer
-(7,19)-(7,30) Expected constant expression for initializer
-(9,33)-(9,44) Expected constant expression for initializer
+(6,22)-(6,31) Expected constant expression for initializer
+(7,21)-(7,30) Expected constant expression for initializer
+(9,35)-(9,44) Expected constant expression for initializer

hphp/hack/test/full_fidelity/cases/lambda_default_args/list_expression.php.errors.exp

@@ -1,3 +1,3 @@
-(6,20)-(6,31) Expected constant expression for initializer
-(7,19)-(7,30) Expected constant expression for initializer
-(10,21)-(10,32) Expected constant expression for initializer
+(6,22)-(6,31) Expected constant expression for initializer
+(7,21)-(7,30) Expected constant expression for initializer
+(10,23)-(10,32) Expected constant expression for initializer

hphp/hack/test/typecheck/global_const18.php.exp

@@ -1,4 +1,4 @@
-ERROR: File "global_const18.php", line 3, characters 15-20:
+ERROR: File "global_const18.php", line 3, characters 17-20:
 Expected constant expression for initializer (Parsing[1002])
 ERROR: File "global_const18.php", line 3, characters 17-20:
 Illegal constant value (Naming[2023])