From d3f69cb620f73fc6c7b2bb04fe5e86f8ac1c3677 Mon Sep 17 00:00:00 2001
From: Oguz Ulgen <oulgen@fb.com>
Date: Wed, 16 Sep 2020 17:15:41 -0700
Subject: [PATCH] Remove $GLOBALS from hack tests

Reviewed By: paulbiss

Differential Revision: D23737871

fbshipit-source-id: 2ed1e35be8e3503671667f12d9e42a3b6857652c
---
 .../hack/test/full_fidelity/cases/globals-read.php |   7 -
 .../cases/globals-read.php.errors.exp              |   1 -
 .../full_fidelity/cases/globals-read.php.json.exp  | 382 --------------
 .../full_fidelity/cases/globals-references.php     |   7 -
 .../cases/globals-references.php.errors.exp        |   1 -
 .../cases/globals-references.php.json.exp          | 428 ----------------
 .../test/full_fidelity/cases/globals-write.php     |   6 -
 .../cases/globals-write.php.errors.exp             |   1 -
 .../full_fidelity/cases/globals-write.php.json.exp | 379 --------------
 hphp/hack/test/full_fidelity/cases/globals.php     |   8 -
 .../full_fidelity/cases/globals.php.errors.exp     |   1 -
 .../test/full_fidelity/cases/globals.php.json.exp  | 556 ---------------------
 .../full_fidelity/cases/superglobal-reference.php  |   1 -
 .../cases/superglobal-reference.php.errors.exp     |   1 -
 .../cases/superglobal-reference.php.json.exp       | 120 +----
 hphp/hack/test/typecheck/badglobal.php             |   6 -
 hphp/hack/test/typecheck/badglobal.php.exp         |   2 -
 .../test/typecheck/inout/bad_inout_use_globals.php |   7 -
 .../typecheck/inout/bad_inout_use_globals.php.exp  |   2 -
 .../test/typecheck/reactive/rx_superglobals10.php  |   6 -
 .../typecheck/reactive/rx_superglobals10.php.exp   |   2 -
 21 files changed, 7 insertions(+), 1917 deletions(-)
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-read.php
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-read.php.errors.exp
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-read.php.json.exp
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-references.php
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-references.php.errors.exp
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-references.php.json.exp
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-write.php
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-write.php.errors.exp
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals-write.php.json.exp
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals.php
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals.php.errors.exp
 delete mode 100644 hphp/hack/test/full_fidelity/cases/globals.php.json.exp
 delete mode 100644 hphp/hack/test/typecheck/badglobal.php
 delete mode 100644 hphp/hack/test/typecheck/badglobal.php.exp
 delete mode 100644 hphp/hack/test/typecheck/inout/bad_inout_use_globals.php
 delete mode 100644 hphp/hack/test/typecheck/inout/bad_inout_use_globals.php.exp
 delete mode 100644 hphp/hack/test/typecheck/reactive/rx_superglobals10.php
 delete mode 100644 hphp/hack/test/typecheck/reactive/rx_superglobals10.php.exp

diff --git a/hphp/hack/test/full_fidelity/cases/globals-read.php b/hphp/hack/test/full_fidelity/cases/globals-read.php
deleted file mode 100644
index 87b3706aebb..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-read.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?hh // partial
-
-
-function g() {
-  $y = $GLOBALS['foo']; // ok
-  $x = $GLOBALS; // not ok
-}
diff --git a/hphp/hack/test/full_fidelity/cases/globals-read.php.errors.exp b/hphp/hack/test/full_fidelity/cases/globals-read.php.errors.exp
deleted file mode 100644
index 7fc8d7bcb0a..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-read.php.errors.exp
+++ /dev/null
@@ -1 +0,0 @@
-(6,8)-(6,16) `$GLOBALS` access requires a subscript.
diff --git a/hphp/hack/test/full_fidelity/cases/globals-read.php.json.exp b/hphp/hack/test/full_fidelity/cases/globals-read.php.json.exp
deleted file mode 100644
index e3927d3cdf6..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-read.php.json.exp
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "parse_tree":{
-    "kind":"script",
-    "script_declarations":{
-      "kind":"list",
-      "elements":[
-        {
-          "kind":"markup_section",
-          "markup_text":{
-            "kind":"token",
-            "token":{
-              "kind":"markup",
-              "text":"",
-              "offset":0,
-              "leading_width":0,
-              "width":0,
-              "trailing_width":0,
-              "leading":[],
-              "trailing":[],
-              "line_number":1
-            }
-          },
-          "markup_suffix":{
-            "kind":"markup_suffix",
-            "markup_suffix_less_than_question":{
-              "kind":"token",
-              "token":{
-                "kind":"<?",
-                "text":"<?",
-                "offset":0,
-                "leading_width":0,
-                "width":2,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":1
-              }
-            },
-            "markup_suffix_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"hh",
-                "offset":2,
-                "leading_width":0,
-                "width":2,
-                "trailing_width":12,
-                "leading":[],
-                "trailing":[
-                  {"kind":"whitespace","text":" ","offset":4,"width":1},
-                  {"kind":"single_line_comment","text":"// partial","offset":5,"width":10},
-                  {"kind":"end_of_line","text":"\n","offset":15,"width":1}
-                ],
-                "line_number":1
-              }
-            }
-          }
-        },
-        {
-          "kind":"function_declaration",
-          "function_attribute_spec":{"kind":"missing"},
-          "function_declaration_header":{
-            "kind":"function_declaration_header",
-            "function_modifiers":{"kind":"missing"},
-            "function_keyword":{
-              "kind":"token",
-              "token":{
-                "kind":"function",
-                "text":"function",
-                "offset":16,
-                "leading_width":2,
-                "width":8,
-                "trailing_width":1,
-                "leading":[
-                  {"kind":"end_of_line","text":"\n","offset":16,"width":1},
-                  {"kind":"end_of_line","text":"\n","offset":17,"width":1}
-                ],
-                "trailing":[{"kind":"whitespace","text":" ","offset":26,"width":1}],
-                "line_number":4
-              }
-            },
-            "function_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"g",
-                "offset":27,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":4
-              }
-            },
-            "function_type_parameter_list":{"kind":"missing"},
-            "function_left_paren":{
-              "kind":"token",
-              "token":{
-                "kind":"(",
-                "text":"(",
-                "offset":28,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":4
-              }
-            },
-            "function_parameter_list":{"kind":"missing"},
-            "function_right_paren":{
-              "kind":"token",
-              "token":{
-                "kind":")",
-                "text":")",
-                "offset":29,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"whitespace","text":" ","offset":30,"width":1}],
-                "line_number":4
-              }
-            },
-            "function_capability_provisional":{"kind":"missing"},
-            "function_colon":{"kind":"missing"},
-            "function_type":{"kind":"missing"},
-            "function_where_clause":{"kind":"missing"}
-          },
-          "function_body":{
-            "kind":"compound_statement",
-            "compound_left_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"{",
-                "text":"{",
-                "offset":31,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":32,"width":1}],
-                "line_number":4
-              }
-            },
-            "compound_statements":{
-              "kind":"list",
-              "elements":[
-                {
-                  "kind":"expression_statement",
-                  "expression_statement_expression":{
-                    "kind":"binary_expression",
-                    "binary_left_operand":{
-                      "kind":"variable",
-                      "variable_expression":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"variable",
-                          "text":"$y",
-                          "offset":33,
-                          "leading_width":2,
-                          "width":2,
-                          "trailing_width":1,
-                          "leading":[{"kind":"whitespace","text":"  ","offset":33,"width":2}],
-                          "trailing":[{"kind":"whitespace","text":" ","offset":37,"width":1}],
-                          "line_number":5
-                        }
-                      }
-                    },
-                    "binary_operator":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"=",
-                        "text":"=",
-                        "offset":38,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":1,
-                        "leading":[],
-                        "trailing":[{"kind":"whitespace","text":" ","offset":39,"width":1}],
-                        "line_number":5
-                      }
-                    },
-                    "binary_right_operand":{
-                      "kind":"subscript_expression",
-                      "subscript_receiver":{
-                        "kind":"variable",
-                        "variable_expression":{
-                          "kind":"token",
-                          "token":{
-                            "kind":"variable",
-                            "text":"$GLOBALS",
-                            "offset":40,
-                            "leading_width":0,
-                            "width":8,
-                            "trailing_width":0,
-                            "leading":[],
-                            "trailing":[],
-                            "line_number":5
-                          }
-                        }
-                      },
-                      "subscript_left_bracket":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"[",
-                          "text":"[",
-                          "offset":48,
-                          "leading_width":0,
-                          "width":1,
-                          "trailing_width":0,
-                          "leading":[],
-                          "trailing":[],
-                          "line_number":5
-                        }
-                      },
-                      "subscript_index":{
-                        "kind":"literal",
-                        "literal_expression":{
-                          "kind":"token",
-                          "token":{
-                            "kind":"single_quoted_string_literal",
-                            "text":"'foo'",
-                            "offset":49,
-                            "leading_width":0,
-                            "width":5,
-                            "trailing_width":0,
-                            "leading":[],
-                            "trailing":[],
-                            "line_number":5
-                          }
-                        }
-                      },
-                      "subscript_right_bracket":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"]",
-                          "text":"]",
-                          "offset":54,
-                          "leading_width":0,
-                          "width":1,
-                          "trailing_width":0,
-                          "leading":[],
-                          "trailing":[],
-                          "line_number":5
-                        }
-                      }
-                    }
-                  },
-                  "expression_statement_semicolon":{
-                    "kind":"token",
-                    "token":{
-                      "kind":";",
-                      "text":";",
-                      "offset":55,
-                      "leading_width":0,
-                      "width":1,
-                      "trailing_width":7,
-                      "leading":[],
-                      "trailing":[
-                        {"kind":"whitespace","text":" ","offset":56,"width":1},
-                        {"kind":"single_line_comment","text":"// ok","offset":57,"width":5},
-                        {"kind":"end_of_line","text":"\n","offset":62,"width":1}
-                      ],
-                      "line_number":5
-                    }
-                  }
-                },
-                {
-                  "kind":"expression_statement",
-                  "expression_statement_expression":{
-                    "kind":"binary_expression",
-                    "binary_left_operand":{
-                      "kind":"variable",
-                      "variable_expression":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"variable",
-                          "text":"$x",
-                          "offset":63,
-                          "leading_width":2,
-                          "width":2,
-                          "trailing_width":1,
-                          "leading":[{"kind":"whitespace","text":"  ","offset":63,"width":2}],
-                          "trailing":[{"kind":"whitespace","text":" ","offset":67,"width":1}],
-                          "line_number":6
-                        }
-                      }
-                    },
-                    "binary_operator":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"=",
-                        "text":"=",
-                        "offset":68,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":1,
-                        "leading":[],
-                        "trailing":[{"kind":"whitespace","text":" ","offset":69,"width":1}],
-                        "line_number":6
-                      }
-                    },
-                    "binary_right_operand":{
-                      "kind":"variable",
-                      "variable_expression":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"variable",
-                          "text":"$GLOBALS",
-                          "offset":70,
-                          "leading_width":0,
-                          "width":8,
-                          "trailing_width":0,
-                          "leading":[],
-                          "trailing":[],
-                          "line_number":6
-                        }
-                      }
-                    }
-                  },
-                  "expression_statement_semicolon":{
-                    "kind":"token",
-                    "token":{
-                      "kind":";",
-                      "text":";",
-                      "offset":78,
-                      "leading_width":0,
-                      "width":1,
-                      "trailing_width":11,
-                      "leading":[],
-                      "trailing":[
-                        {"kind":"whitespace","text":" ","offset":79,"width":1},
-                        {"kind":"single_line_comment","text":"// not ok","offset":80,"width":9},
-                        {"kind":"end_of_line","text":"\n","offset":89,"width":1}
-                      ],
-                      "line_number":6
-                    }
-                  }
-                }
-              ]
-            },
-            "compound_right_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"}",
-                "text":"}",
-                "offset":90,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":91,"width":1}],
-                "line_number":7
-              }
-            }
-          }
-        },
-        {
-          "kind":"end_of_file",
-          "end_of_file_token":{
-            "kind":"token",
-            "token":{
-              "kind":"end_of_file",
-              "text":"",
-              "offset":92,
-              "leading_width":0,
-              "width":0,
-              "trailing_width":0,
-              "leading":[],
-              "trailing":[],
-              "line_number":8
-            }
-          }
-        }
-      ]
-    }
-  },
-  "program_text":"<?hh // partial\n\n\nfunction g() {\n  $y = $GLOBALS['foo']; // ok\n  $x = $GLOBALS; // not ok\n}\n",
-  "version":"2020-08-17-0000"
-}
diff --git a/hphp/hack/test/full_fidelity/cases/globals-references.php b/hphp/hack/test/full_fidelity/cases/globals-references.php
deleted file mode 100644
index 27240393173..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-references.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?hh // partial
-
-
-function f($_) {}
-function g() {
-  f(inout $GLOBALS);
-}
diff --git a/hphp/hack/test/full_fidelity/cases/globals-references.php.errors.exp b/hphp/hack/test/full_fidelity/cases/globals-references.php.errors.exp
deleted file mode 100644
index 1fc81e2e805..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-references.php.errors.exp
+++ /dev/null
@@ -1 +0,0 @@
-(6,5)-(6,19) You cannot decorate this argument as `inout`
diff --git a/hphp/hack/test/full_fidelity/cases/globals-references.php.json.exp b/hphp/hack/test/full_fidelity/cases/globals-references.php.json.exp
deleted file mode 100644
index 644863eeb70..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-references.php.json.exp
+++ /dev/null
@@ -1,428 +0,0 @@
-{
-  "parse_tree":{
-    "kind":"script",
-    "script_declarations":{
-      "kind":"list",
-      "elements":[
-        {
-          "kind":"markup_section",
-          "markup_text":{
-            "kind":"token",
-            "token":{
-              "kind":"markup",
-              "text":"",
-              "offset":0,
-              "leading_width":0,
-              "width":0,
-              "trailing_width":0,
-              "leading":[],
-              "trailing":[],
-              "line_number":1
-            }
-          },
-          "markup_suffix":{
-            "kind":"markup_suffix",
-            "markup_suffix_less_than_question":{
-              "kind":"token",
-              "token":{
-                "kind":"<?",
-                "text":"<?",
-                "offset":0,
-                "leading_width":0,
-                "width":2,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":1
-              }
-            },
-            "markup_suffix_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"hh",
-                "offset":2,
-                "leading_width":0,
-                "width":2,
-                "trailing_width":12,
-                "leading":[],
-                "trailing":[
-                  {"kind":"whitespace","text":" ","offset":4,"width":1},
-                  {"kind":"single_line_comment","text":"// partial","offset":5,"width":10},
-                  {"kind":"end_of_line","text":"\n","offset":15,"width":1}
-                ],
-                "line_number":1
-              }
-            }
-          }
-        },
-        {
-          "kind":"function_declaration",
-          "function_attribute_spec":{"kind":"missing"},
-          "function_declaration_header":{
-            "kind":"function_declaration_header",
-            "function_modifiers":{"kind":"missing"},
-            "function_keyword":{
-              "kind":"token",
-              "token":{
-                "kind":"function",
-                "text":"function",
-                "offset":16,
-                "leading_width":2,
-                "width":8,
-                "trailing_width":1,
-                "leading":[
-                  {"kind":"end_of_line","text":"\n","offset":16,"width":1},
-                  {"kind":"end_of_line","text":"\n","offset":17,"width":1}
-                ],
-                "trailing":[{"kind":"whitespace","text":" ","offset":26,"width":1}],
-                "line_number":4
-              }
-            },
-            "function_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"f",
-                "offset":27,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":4
-              }
-            },
-            "function_type_parameter_list":{"kind":"missing"},
-            "function_left_paren":{
-              "kind":"token",
-              "token":{
-                "kind":"(",
-                "text":"(",
-                "offset":28,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":4
-              }
-            },
-            "function_parameter_list":{
-              "kind":"list",
-              "elements":[
-                {
-                  "kind":"list_item",
-                  "list_item":{
-                    "kind":"parameter_declaration",
-                    "parameter_attribute":{"kind":"missing"},
-                    "parameter_visibility":{"kind":"missing"},
-                    "parameter_call_convention":{"kind":"missing"},
-                    "parameter_type":{"kind":"missing"},
-                    "parameter_name":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"variable",
-                        "text":"$_",
-                        "offset":29,
-                        "leading_width":0,
-                        "width":2,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":4
-                      }
-                    },
-                    "parameter_default_value":{"kind":"missing"}
-                  },
-                  "list_separator":{"kind":"missing"}
-                }
-              ]
-            },
-            "function_right_paren":{
-              "kind":"token",
-              "token":{
-                "kind":")",
-                "text":")",
-                "offset":31,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"whitespace","text":" ","offset":32,"width":1}],
-                "line_number":4
-              }
-            },
-            "function_capability_provisional":{"kind":"missing"},
-            "function_colon":{"kind":"missing"},
-            "function_type":{"kind":"missing"},
-            "function_where_clause":{"kind":"missing"}
-          },
-          "function_body":{
-            "kind":"compound_statement",
-            "compound_left_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"{",
-                "text":"{",
-                "offset":33,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":4
-              }
-            },
-            "compound_statements":{"kind":"missing"},
-            "compound_right_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"}",
-                "text":"}",
-                "offset":34,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":35,"width":1}],
-                "line_number":4
-              }
-            }
-          }
-        },
-        {
-          "kind":"function_declaration",
-          "function_attribute_spec":{"kind":"missing"},
-          "function_declaration_header":{
-            "kind":"function_declaration_header",
-            "function_modifiers":{"kind":"missing"},
-            "function_keyword":{
-              "kind":"token",
-              "token":{
-                "kind":"function",
-                "text":"function",
-                "offset":36,
-                "leading_width":0,
-                "width":8,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"whitespace","text":" ","offset":44,"width":1}],
-                "line_number":5
-              }
-            },
-            "function_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"g",
-                "offset":45,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":5
-              }
-            },
-            "function_type_parameter_list":{"kind":"missing"},
-            "function_left_paren":{
-              "kind":"token",
-              "token":{
-                "kind":"(",
-                "text":"(",
-                "offset":46,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":5
-              }
-            },
-            "function_parameter_list":{"kind":"missing"},
-            "function_right_paren":{
-              "kind":"token",
-              "token":{
-                "kind":")",
-                "text":")",
-                "offset":47,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"whitespace","text":" ","offset":48,"width":1}],
-                "line_number":5
-              }
-            },
-            "function_capability_provisional":{"kind":"missing"},
-            "function_colon":{"kind":"missing"},
-            "function_type":{"kind":"missing"},
-            "function_where_clause":{"kind":"missing"}
-          },
-          "function_body":{
-            "kind":"compound_statement",
-            "compound_left_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"{",
-                "text":"{",
-                "offset":49,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":50,"width":1}],
-                "line_number":5
-              }
-            },
-            "compound_statements":{
-              "kind":"list",
-              "elements":[
-                {
-                  "kind":"expression_statement",
-                  "expression_statement_expression":{
-                    "kind":"function_call_expression",
-                    "function_call_receiver":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"name",
-                        "text":"f",
-                        "offset":51,
-                        "leading_width":2,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[{"kind":"whitespace","text":"  ","offset":51,"width":2}],
-                        "trailing":[],
-                        "line_number":6
-                      }
-                    },
-                    "function_call_type_args":{"kind":"missing"},
-                    "function_call_left_paren":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"(",
-                        "text":"(",
-                        "offset":54,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":6
-                      }
-                    },
-                    "function_call_argument_list":{
-                      "kind":"list",
-                      "elements":[
-                        {
-                          "kind":"list_item",
-                          "list_item":{
-                            "kind":"decorated_expression",
-                            "decorated_expression_decorator":{
-                              "kind":"token",
-                              "token":{
-                                "kind":"inout",
-                                "text":"inout",
-                                "offset":55,
-                                "leading_width":0,
-                                "width":5,
-                                "trailing_width":1,
-                                "leading":[],
-                                "trailing":[{"kind":"whitespace","text":" ","offset":60,"width":1}],
-                                "line_number":6
-                              }
-                            },
-                            "decorated_expression_expression":{
-                              "kind":"variable",
-                              "variable_expression":{
-                                "kind":"token",
-                                "token":{
-                                  "kind":"variable",
-                                  "text":"$GLOBALS",
-                                  "offset":61,
-                                  "leading_width":0,
-                                  "width":8,
-                                  "trailing_width":0,
-                                  "leading":[],
-                                  "trailing":[],
-                                  "line_number":6
-                                }
-                              }
-                            }
-                          },
-                          "list_separator":{"kind":"missing"}
-                        }
-                      ]
-                    },
-                    "function_call_right_paren":{
-                      "kind":"token",
-                      "token":{
-                        "kind":")",
-                        "text":")",
-                        "offset":69,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":6
-                      }
-                    }
-                  },
-                  "expression_statement_semicolon":{
-                    "kind":"token",
-                    "token":{
-                      "kind":";",
-                      "text":";",
-                      "offset":70,
-                      "leading_width":0,
-                      "width":1,
-                      "trailing_width":1,
-                      "leading":[],
-                      "trailing":[{"kind":"end_of_line","text":"\n","offset":71,"width":1}],
-                      "line_number":6
-                    }
-                  }
-                }
-              ]
-            },
-            "compound_right_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"}",
-                "text":"}",
-                "offset":72,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":73,"width":1}],
-                "line_number":7
-              }
-            }
-          }
-        },
-        {
-          "kind":"end_of_file",
-          "end_of_file_token":{
-            "kind":"token",
-            "token":{
-              "kind":"end_of_file",
-              "text":"",
-              "offset":74,
-              "leading_width":0,
-              "width":0,
-              "trailing_width":0,
-              "leading":[],
-              "trailing":[],
-              "line_number":8
-            }
-          }
-        }
-      ]
-    }
-  },
-  "program_text":"<?hh // partial\n\n\nfunction f($_) {}\nfunction g() {\n  f(inout $GLOBALS);\n}\n",
-  "version":"2020-08-17-0000"
-}
diff --git a/hphp/hack/test/full_fidelity/cases/globals-write.php b/hphp/hack/test/full_fidelity/cases/globals-write.php
deleted file mode 100644
index 5845bb99075..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-write.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?hh // partial
-
-function g() {
-  $GLOBALS['derp'] = null; // ok
-  $GLOBALS = null; // not ok
-}
diff --git a/hphp/hack/test/full_fidelity/cases/globals-write.php.errors.exp b/hphp/hack/test/full_fidelity/cases/globals-write.php.errors.exp
deleted file mode 100644
index d8e7ec5af3a..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-write.php.errors.exp
+++ /dev/null
@@ -1 +0,0 @@
-(5,3)-(5,11) `$GLOBALS` is not allowed in write context
diff --git a/hphp/hack/test/full_fidelity/cases/globals-write.php.json.exp b/hphp/hack/test/full_fidelity/cases/globals-write.php.json.exp
deleted file mode 100644
index bced482bdc1..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals-write.php.json.exp
+++ /dev/null
@@ -1,379 +0,0 @@
-{
-  "parse_tree":{
-    "kind":"script",
-    "script_declarations":{
-      "kind":"list",
-      "elements":[
-        {
-          "kind":"markup_section",
-          "markup_text":{
-            "kind":"token",
-            "token":{
-              "kind":"markup",
-              "text":"",
-              "offset":0,
-              "leading_width":0,
-              "width":0,
-              "trailing_width":0,
-              "leading":[],
-              "trailing":[],
-              "line_number":1
-            }
-          },
-          "markup_suffix":{
-            "kind":"markup_suffix",
-            "markup_suffix_less_than_question":{
-              "kind":"token",
-              "token":{
-                "kind":"<?",
-                "text":"<?",
-                "offset":0,
-                "leading_width":0,
-                "width":2,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":1
-              }
-            },
-            "markup_suffix_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"hh",
-                "offset":2,
-                "leading_width":0,
-                "width":2,
-                "trailing_width":12,
-                "leading":[],
-                "trailing":[
-                  {"kind":"whitespace","text":" ","offset":4,"width":1},
-                  {"kind":"single_line_comment","text":"// partial","offset":5,"width":10},
-                  {"kind":"end_of_line","text":"\n","offset":15,"width":1}
-                ],
-                "line_number":1
-              }
-            }
-          }
-        },
-        {
-          "kind":"function_declaration",
-          "function_attribute_spec":{"kind":"missing"},
-          "function_declaration_header":{
-            "kind":"function_declaration_header",
-            "function_modifiers":{"kind":"missing"},
-            "function_keyword":{
-              "kind":"token",
-              "token":{
-                "kind":"function",
-                "text":"function",
-                "offset":16,
-                "leading_width":1,
-                "width":8,
-                "trailing_width":1,
-                "leading":[{"kind":"end_of_line","text":"\n","offset":16,"width":1}],
-                "trailing":[{"kind":"whitespace","text":" ","offset":25,"width":1}],
-                "line_number":3
-              }
-            },
-            "function_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"g",
-                "offset":26,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":3
-              }
-            },
-            "function_type_parameter_list":{"kind":"missing"},
-            "function_left_paren":{
-              "kind":"token",
-              "token":{
-                "kind":"(",
-                "text":"(",
-                "offset":27,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":3
-              }
-            },
-            "function_parameter_list":{"kind":"missing"},
-            "function_right_paren":{
-              "kind":"token",
-              "token":{
-                "kind":")",
-                "text":")",
-                "offset":28,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"whitespace","text":" ","offset":29,"width":1}],
-                "line_number":3
-              }
-            },
-            "function_capability_provisional":{"kind":"missing"},
-            "function_colon":{"kind":"missing"},
-            "function_type":{"kind":"missing"},
-            "function_where_clause":{"kind":"missing"}
-          },
-          "function_body":{
-            "kind":"compound_statement",
-            "compound_left_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"{",
-                "text":"{",
-                "offset":30,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":31,"width":1}],
-                "line_number":3
-              }
-            },
-            "compound_statements":{
-              "kind":"list",
-              "elements":[
-                {
-                  "kind":"expression_statement",
-                  "expression_statement_expression":{
-                    "kind":"binary_expression",
-                    "binary_left_operand":{
-                      "kind":"subscript_expression",
-                      "subscript_receiver":{
-                        "kind":"variable",
-                        "variable_expression":{
-                          "kind":"token",
-                          "token":{
-                            "kind":"variable",
-                            "text":"$GLOBALS",
-                            "offset":32,
-                            "leading_width":2,
-                            "width":8,
-                            "trailing_width":0,
-                            "leading":[{"kind":"whitespace","text":"  ","offset":32,"width":2}],
-                            "trailing":[],
-                            "line_number":4
-                          }
-                        }
-                      },
-                      "subscript_left_bracket":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"[",
-                          "text":"[",
-                          "offset":42,
-                          "leading_width":0,
-                          "width":1,
-                          "trailing_width":0,
-                          "leading":[],
-                          "trailing":[],
-                          "line_number":4
-                        }
-                      },
-                      "subscript_index":{
-                        "kind":"literal",
-                        "literal_expression":{
-                          "kind":"token",
-                          "token":{
-                            "kind":"single_quoted_string_literal",
-                            "text":"'derp'",
-                            "offset":43,
-                            "leading_width":0,
-                            "width":6,
-                            "trailing_width":0,
-                            "leading":[],
-                            "trailing":[],
-                            "line_number":4
-                          }
-                        }
-                      },
-                      "subscript_right_bracket":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"]",
-                          "text":"]",
-                          "offset":49,
-                          "leading_width":0,
-                          "width":1,
-                          "trailing_width":1,
-                          "leading":[],
-                          "trailing":[{"kind":"whitespace","text":" ","offset":50,"width":1}],
-                          "line_number":4
-                        }
-                      }
-                    },
-                    "binary_operator":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"=",
-                        "text":"=",
-                        "offset":51,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":1,
-                        "leading":[],
-                        "trailing":[{"kind":"whitespace","text":" ","offset":52,"width":1}],
-                        "line_number":4
-                      }
-                    },
-                    "binary_right_operand":{
-                      "kind":"literal",
-                      "literal_expression":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"null",
-                          "text":"null",
-                          "offset":53,
-                          "leading_width":0,
-                          "width":4,
-                          "trailing_width":0,
-                          "leading":[],
-                          "trailing":[],
-                          "line_number":4
-                        }
-                      }
-                    }
-                  },
-                  "expression_statement_semicolon":{
-                    "kind":"token",
-                    "token":{
-                      "kind":";",
-                      "text":";",
-                      "offset":57,
-                      "leading_width":0,
-                      "width":1,
-                      "trailing_width":7,
-                      "leading":[],
-                      "trailing":[
-                        {"kind":"whitespace","text":" ","offset":58,"width":1},
-                        {"kind":"single_line_comment","text":"// ok","offset":59,"width":5},
-                        {"kind":"end_of_line","text":"\n","offset":64,"width":1}
-                      ],
-                      "line_number":4
-                    }
-                  }
-                },
-                {
-                  "kind":"expression_statement",
-                  "expression_statement_expression":{
-                    "kind":"binary_expression",
-                    "binary_left_operand":{
-                      "kind":"variable",
-                      "variable_expression":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"variable",
-                          "text":"$GLOBALS",
-                          "offset":65,
-                          "leading_width":2,
-                          "width":8,
-                          "trailing_width":1,
-                          "leading":[{"kind":"whitespace","text":"  ","offset":65,"width":2}],
-                          "trailing":[{"kind":"whitespace","text":" ","offset":75,"width":1}],
-                          "line_number":5
-                        }
-                      }
-                    },
-                    "binary_operator":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"=",
-                        "text":"=",
-                        "offset":76,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":1,
-                        "leading":[],
-                        "trailing":[{"kind":"whitespace","text":" ","offset":77,"width":1}],
-                        "line_number":5
-                      }
-                    },
-                    "binary_right_operand":{
-                      "kind":"literal",
-                      "literal_expression":{
-                        "kind":"token",
-                        "token":{
-                          "kind":"null",
-                          "text":"null",
-                          "offset":78,
-                          "leading_width":0,
-                          "width":4,
-                          "trailing_width":0,
-                          "leading":[],
-                          "trailing":[],
-                          "line_number":5
-                        }
-                      }
-                    }
-                  },
-                  "expression_statement_semicolon":{
-                    "kind":"token",
-                    "token":{
-                      "kind":";",
-                      "text":";",
-                      "offset":82,
-                      "leading_width":0,
-                      "width":1,
-                      "trailing_width":11,
-                      "leading":[],
-                      "trailing":[
-                        {"kind":"whitespace","text":" ","offset":83,"width":1},
-                        {"kind":"single_line_comment","text":"// not ok","offset":84,"width":9},
-                        {"kind":"end_of_line","text":"\n","offset":93,"width":1}
-                      ],
-                      "line_number":5
-                    }
-                  }
-                }
-              ]
-            },
-            "compound_right_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"}",
-                "text":"}",
-                "offset":94,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":95,"width":1}],
-                "line_number":6
-              }
-            }
-          }
-        },
-        {
-          "kind":"end_of_file",
-          "end_of_file_token":{
-            "kind":"token",
-            "token":{
-              "kind":"end_of_file",
-              "text":"",
-              "offset":96,
-              "leading_width":0,
-              "width":0,
-              "trailing_width":0,
-              "leading":[],
-              "trailing":[],
-              "line_number":7
-            }
-          }
-        }
-      ]
-    }
-  },
-  "program_text":"<?hh // partial\n\nfunction g() {\n  $GLOBALS['derp'] = null; // ok\n  $GLOBALS = null; // not ok\n}\n",
-  "version":"2020-08-17-0000"
-}
diff --git a/hphp/hack/test/full_fidelity/cases/globals.php b/hphp/hack/test/full_fidelity/cases/globals.php
deleted file mode 100644
index f3d35fd1566..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?hh // partial
-
-
-function f($_) {}
-function g() {
-  f($GLOBALS['derp']); // ok
-  f($GLOBALS); // not ok
-}
diff --git a/hphp/hack/test/full_fidelity/cases/globals.php.errors.exp b/hphp/hack/test/full_fidelity/cases/globals.php.errors.exp
deleted file mode 100644
index 32609a4c626..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals.php.errors.exp
+++ /dev/null
@@ -1 +0,0 @@
-(7,5)-(7,13) `$GLOBALS` access requires a subscript.
diff --git a/hphp/hack/test/full_fidelity/cases/globals.php.json.exp b/hphp/hack/test/full_fidelity/cases/globals.php.json.exp
deleted file mode 100644
index 2aba24bfb03..00000000000
--- a/hphp/hack/test/full_fidelity/cases/globals.php.json.exp
+++ /dev/null
@@ -1,556 +0,0 @@
-{
-  "parse_tree":{
-    "kind":"script",
-    "script_declarations":{
-      "kind":"list",
-      "elements":[
-        {
-          "kind":"markup_section",
-          "markup_text":{
-            "kind":"token",
-            "token":{
-              "kind":"markup",
-              "text":"",
-              "offset":0,
-              "leading_width":0,
-              "width":0,
-              "trailing_width":0,
-              "leading":[],
-              "trailing":[],
-              "line_number":1
-            }
-          },
-          "markup_suffix":{
-            "kind":"markup_suffix",
-            "markup_suffix_less_than_question":{
-              "kind":"token",
-              "token":{
-                "kind":"<?",
-                "text":"<?",
-                "offset":0,
-                "leading_width":0,
-                "width":2,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":1
-              }
-            },
-            "markup_suffix_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"hh",
-                "offset":2,
-                "leading_width":0,
-                "width":2,
-                "trailing_width":12,
-                "leading":[],
-                "trailing":[
-                  {"kind":"whitespace","text":" ","offset":4,"width":1},
-                  {"kind":"single_line_comment","text":"// partial","offset":5,"width":10},
-                  {"kind":"end_of_line","text":"\n","offset":15,"width":1}
-                ],
-                "line_number":1
-              }
-            }
-          }
-        },
-        {
-          "kind":"function_declaration",
-          "function_attribute_spec":{"kind":"missing"},
-          "function_declaration_header":{
-            "kind":"function_declaration_header",
-            "function_modifiers":{"kind":"missing"},
-            "function_keyword":{
-              "kind":"token",
-              "token":{
-                "kind":"function",
-                "text":"function",
-                "offset":16,
-                "leading_width":2,
-                "width":8,
-                "trailing_width":1,
-                "leading":[
-                  {"kind":"end_of_line","text":"\n","offset":16,"width":1},
-                  {"kind":"end_of_line","text":"\n","offset":17,"width":1}
-                ],
-                "trailing":[{"kind":"whitespace","text":" ","offset":26,"width":1}],
-                "line_number":4
-              }
-            },
-            "function_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"f",
-                "offset":27,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":4
-              }
-            },
-            "function_type_parameter_list":{"kind":"missing"},
-            "function_left_paren":{
-              "kind":"token",
-              "token":{
-                "kind":"(",
-                "text":"(",
-                "offset":28,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":4
-              }
-            },
-            "function_parameter_list":{
-              "kind":"list",
-              "elements":[
-                {
-                  "kind":"list_item",
-                  "list_item":{
-                    "kind":"parameter_declaration",
-                    "parameter_attribute":{"kind":"missing"},
-                    "parameter_visibility":{"kind":"missing"},
-                    "parameter_call_convention":{"kind":"missing"},
-                    "parameter_type":{"kind":"missing"},
-                    "parameter_name":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"variable",
-                        "text":"$_",
-                        "offset":29,
-                        "leading_width":0,
-                        "width":2,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":4
-                      }
-                    },
-                    "parameter_default_value":{"kind":"missing"}
-                  },
-                  "list_separator":{"kind":"missing"}
-                }
-              ]
-            },
-            "function_right_paren":{
-              "kind":"token",
-              "token":{
-                "kind":")",
-                "text":")",
-                "offset":31,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"whitespace","text":" ","offset":32,"width":1}],
-                "line_number":4
-              }
-            },
-            "function_capability_provisional":{"kind":"missing"},
-            "function_colon":{"kind":"missing"},
-            "function_type":{"kind":"missing"},
-            "function_where_clause":{"kind":"missing"}
-          },
-          "function_body":{
-            "kind":"compound_statement",
-            "compound_left_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"{",
-                "text":"{",
-                "offset":33,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":4
-              }
-            },
-            "compound_statements":{"kind":"missing"},
-            "compound_right_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"}",
-                "text":"}",
-                "offset":34,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":35,"width":1}],
-                "line_number":4
-              }
-            }
-          }
-        },
-        {
-          "kind":"function_declaration",
-          "function_attribute_spec":{"kind":"missing"},
-          "function_declaration_header":{
-            "kind":"function_declaration_header",
-            "function_modifiers":{"kind":"missing"},
-            "function_keyword":{
-              "kind":"token",
-              "token":{
-                "kind":"function",
-                "text":"function",
-                "offset":36,
-                "leading_width":0,
-                "width":8,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"whitespace","text":" ","offset":44,"width":1}],
-                "line_number":5
-              }
-            },
-            "function_name":{
-              "kind":"token",
-              "token":{
-                "kind":"name",
-                "text":"g",
-                "offset":45,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":5
-              }
-            },
-            "function_type_parameter_list":{"kind":"missing"},
-            "function_left_paren":{
-              "kind":"token",
-              "token":{
-                "kind":"(",
-                "text":"(",
-                "offset":46,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":0,
-                "leading":[],
-                "trailing":[],
-                "line_number":5
-              }
-            },
-            "function_parameter_list":{"kind":"missing"},
-            "function_right_paren":{
-              "kind":"token",
-              "token":{
-                "kind":")",
-                "text":")",
-                "offset":47,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"whitespace","text":" ","offset":48,"width":1}],
-                "line_number":5
-              }
-            },
-            "function_capability_provisional":{"kind":"missing"},
-            "function_colon":{"kind":"missing"},
-            "function_type":{"kind":"missing"},
-            "function_where_clause":{"kind":"missing"}
-          },
-          "function_body":{
-            "kind":"compound_statement",
-            "compound_left_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"{",
-                "text":"{",
-                "offset":49,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":50,"width":1}],
-                "line_number":5
-              }
-            },
-            "compound_statements":{
-              "kind":"list",
-              "elements":[
-                {
-                  "kind":"expression_statement",
-                  "expression_statement_expression":{
-                    "kind":"function_call_expression",
-                    "function_call_receiver":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"name",
-                        "text":"f",
-                        "offset":51,
-                        "leading_width":2,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[{"kind":"whitespace","text":"  ","offset":51,"width":2}],
-                        "trailing":[],
-                        "line_number":6
-                      }
-                    },
-                    "function_call_type_args":{"kind":"missing"},
-                    "function_call_left_paren":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"(",
-                        "text":"(",
-                        "offset":54,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":6
-                      }
-                    },
-                    "function_call_argument_list":{
-                      "kind":"list",
-                      "elements":[
-                        {
-                          "kind":"list_item",
-                          "list_item":{
-                            "kind":"subscript_expression",
-                            "subscript_receiver":{
-                              "kind":"variable",
-                              "variable_expression":{
-                                "kind":"token",
-                                "token":{
-                                  "kind":"variable",
-                                  "text":"$GLOBALS",
-                                  "offset":55,
-                                  "leading_width":0,
-                                  "width":8,
-                                  "trailing_width":0,
-                                  "leading":[],
-                                  "trailing":[],
-                                  "line_number":6
-                                }
-                              }
-                            },
-                            "subscript_left_bracket":{
-                              "kind":"token",
-                              "token":{
-                                "kind":"[",
-                                "text":"[",
-                                "offset":63,
-                                "leading_width":0,
-                                "width":1,
-                                "trailing_width":0,
-                                "leading":[],
-                                "trailing":[],
-                                "line_number":6
-                              }
-                            },
-                            "subscript_index":{
-                              "kind":"literal",
-                              "literal_expression":{
-                                "kind":"token",
-                                "token":{
-                                  "kind":"single_quoted_string_literal",
-                                  "text":"'derp'",
-                                  "offset":64,
-                                  "leading_width":0,
-                                  "width":6,
-                                  "trailing_width":0,
-                                  "leading":[],
-                                  "trailing":[],
-                                  "line_number":6
-                                }
-                              }
-                            },
-                            "subscript_right_bracket":{
-                              "kind":"token",
-                              "token":{
-                                "kind":"]",
-                                "text":"]",
-                                "offset":70,
-                                "leading_width":0,
-                                "width":1,
-                                "trailing_width":0,
-                                "leading":[],
-                                "trailing":[],
-                                "line_number":6
-                              }
-                            }
-                          },
-                          "list_separator":{"kind":"missing"}
-                        }
-                      ]
-                    },
-                    "function_call_right_paren":{
-                      "kind":"token",
-                      "token":{
-                        "kind":")",
-                        "text":")",
-                        "offset":71,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":6
-                      }
-                    }
-                  },
-                  "expression_statement_semicolon":{
-                    "kind":"token",
-                    "token":{
-                      "kind":";",
-                      "text":";",
-                      "offset":72,
-                      "leading_width":0,
-                      "width":1,
-                      "trailing_width":7,
-                      "leading":[],
-                      "trailing":[
-                        {"kind":"whitespace","text":" ","offset":73,"width":1},
-                        {"kind":"single_line_comment","text":"// ok","offset":74,"width":5},
-                        {"kind":"end_of_line","text":"\n","offset":79,"width":1}
-                      ],
-                      "line_number":6
-                    }
-                  }
-                },
-                {
-                  "kind":"expression_statement",
-                  "expression_statement_expression":{
-                    "kind":"function_call_expression",
-                    "function_call_receiver":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"name",
-                        "text":"f",
-                        "offset":80,
-                        "leading_width":2,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[{"kind":"whitespace","text":"  ","offset":80,"width":2}],
-                        "trailing":[],
-                        "line_number":7
-                      }
-                    },
-                    "function_call_type_args":{"kind":"missing"},
-                    "function_call_left_paren":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"(",
-                        "text":"(",
-                        "offset":83,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":7
-                      }
-                    },
-                    "function_call_argument_list":{
-                      "kind":"list",
-                      "elements":[
-                        {
-                          "kind":"list_item",
-                          "list_item":{
-                            "kind":"variable",
-                            "variable_expression":{
-                              "kind":"token",
-                              "token":{
-                                "kind":"variable",
-                                "text":"$GLOBALS",
-                                "offset":84,
-                                "leading_width":0,
-                                "width":8,
-                                "trailing_width":0,
-                                "leading":[],
-                                "trailing":[],
-                                "line_number":7
-                              }
-                            }
-                          },
-                          "list_separator":{"kind":"missing"}
-                        }
-                      ]
-                    },
-                    "function_call_right_paren":{
-                      "kind":"token",
-                      "token":{
-                        "kind":")",
-                        "text":")",
-                        "offset":92,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":7
-                      }
-                    }
-                  },
-                  "expression_statement_semicolon":{
-                    "kind":"token",
-                    "token":{
-                      "kind":";",
-                      "text":";",
-                      "offset":93,
-                      "leading_width":0,
-                      "width":1,
-                      "trailing_width":11,
-                      "leading":[],
-                      "trailing":[
-                        {"kind":"whitespace","text":" ","offset":94,"width":1},
-                        {"kind":"single_line_comment","text":"// not ok","offset":95,"width":9},
-                        {"kind":"end_of_line","text":"\n","offset":104,"width":1}
-                      ],
-                      "line_number":7
-                    }
-                  }
-                }
-              ]
-            },
-            "compound_right_brace":{
-              "kind":"token",
-              "token":{
-                "kind":"}",
-                "text":"}",
-                "offset":105,
-                "leading_width":0,
-                "width":1,
-                "trailing_width":1,
-                "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":106,"width":1}],
-                "line_number":8
-              }
-            }
-          }
-        },
-        {
-          "kind":"end_of_file",
-          "end_of_file_token":{
-            "kind":"token",
-            "token":{
-              "kind":"end_of_file",
-              "text":"",
-              "offset":107,
-              "leading_width":0,
-              "width":0,
-              "trailing_width":0,
-              "leading":[],
-              "trailing":[],
-              "line_number":9
-            }
-          }
-        }
-      ]
-    }
-  },
-  "program_text":"<?hh // partial\n\n\nfunction f($_) {}\nfunction g() {\n  f($GLOBALS['derp']); // ok\n  f($GLOBALS); // not ok\n}\n",
-  "version":"2020-08-17-0000"
-}
diff --git a/hphp/hack/test/full_fidelity/cases/superglobal-reference.php b/hphp/hack/test/full_fidelity/cases/superglobal-reference.php
index ac535ce6edc..e6cb2d09993 100644
--- a/hphp/hack/test/full_fidelity/cases/superglobal-reference.php
+++ b/hphp/hack/test/full_fidelity/cases/superglobal-reference.php
@@ -2,5 +2,4 @@
 
 function f() {
   x(inout $_SERVER);
-  y(inout $GLOBALS);
 }
diff --git a/hphp/hack/test/full_fidelity/cases/superglobal-reference.php.errors.exp b/hphp/hack/test/full_fidelity/cases/superglobal-reference.php.errors.exp
index 11e381a4b0a..54886634669 100644
--- a/hphp/hack/test/full_fidelity/cases/superglobal-reference.php.errors.exp
+++ b/hphp/hack/test/full_fidelity/cases/superglobal-reference.php.errors.exp
@@ -1,2 +1 @@
 (4,5)-(4,19) You cannot decorate this argument as `inout`
-(5,5)-(5,19) You cannot decorate this argument as `inout`
diff --git a/hphp/hack/test/full_fidelity/cases/superglobal-reference.php.json.exp b/hphp/hack/test/full_fidelity/cases/superglobal-reference.php.json.exp
index 7ad672df465..dacd5a30e1f 100644
--- a/hphp/hack/test/full_fidelity/cases/superglobal-reference.php.json.exp
+++ b/hphp/hack/test/full_fidelity/cases/superglobal-reference.php.json.exp
@@ -249,112 +249,6 @@
                       "line_number":4
                     }
                   }
-                },
-                {
-                  "kind":"expression_statement",
-                  "expression_statement_expression":{
-                    "kind":"function_call_expression",
-                    "function_call_receiver":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"name",
-                        "text":"y",
-                        "offset":53,
-                        "leading_width":2,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[{"kind":"whitespace","text":"  ","offset":53,"width":2}],
-                        "trailing":[],
-                        "line_number":5
-                      }
-                    },
-                    "function_call_type_args":{"kind":"missing"},
-                    "function_call_left_paren":{
-                      "kind":"token",
-                      "token":{
-                        "kind":"(",
-                        "text":"(",
-                        "offset":56,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":5
-                      }
-                    },
-                    "function_call_argument_list":{
-                      "kind":"list",
-                      "elements":[
-                        {
-                          "kind":"list_item",
-                          "list_item":{
-                            "kind":"decorated_expression",
-                            "decorated_expression_decorator":{
-                              "kind":"token",
-                              "token":{
-                                "kind":"inout",
-                                "text":"inout",
-                                "offset":57,
-                                "leading_width":0,
-                                "width":5,
-                                "trailing_width":1,
-                                "leading":[],
-                                "trailing":[{"kind":"whitespace","text":" ","offset":62,"width":1}],
-                                "line_number":5
-                              }
-                            },
-                            "decorated_expression_expression":{
-                              "kind":"variable",
-                              "variable_expression":{
-                                "kind":"token",
-                                "token":{
-                                  "kind":"variable",
-                                  "text":"$GLOBALS",
-                                  "offset":63,
-                                  "leading_width":0,
-                                  "width":8,
-                                  "trailing_width":0,
-                                  "leading":[],
-                                  "trailing":[],
-                                  "line_number":5
-                                }
-                              }
-                            }
-                          },
-                          "list_separator":{"kind":"missing"}
-                        }
-                      ]
-                    },
-                    "function_call_right_paren":{
-                      "kind":"token",
-                      "token":{
-                        "kind":")",
-                        "text":")",
-                        "offset":71,
-                        "leading_width":0,
-                        "width":1,
-                        "trailing_width":0,
-                        "leading":[],
-                        "trailing":[],
-                        "line_number":5
-                      }
-                    }
-                  },
-                  "expression_statement_semicolon":{
-                    "kind":"token",
-                    "token":{
-                      "kind":";",
-                      "text":";",
-                      "offset":72,
-                      "leading_width":0,
-                      "width":1,
-                      "trailing_width":1,
-                      "leading":[],
-                      "trailing":[{"kind":"end_of_line","text":"\n","offset":73,"width":1}],
-                      "line_number":5
-                    }
-                  }
                 }
               ]
             },
@@ -363,13 +257,13 @@
               "token":{
                 "kind":"}",
                 "text":"}",
-                "offset":74,
+                "offset":53,
                 "leading_width":0,
                 "width":1,
                 "trailing_width":1,
                 "leading":[],
-                "trailing":[{"kind":"end_of_line","text":"\n","offset":75,"width":1}],
-                "line_number":6
+                "trailing":[{"kind":"end_of_line","text":"\n","offset":54,"width":1}],
+                "line_number":5
               }
             }
           }
@@ -381,19 +275,19 @@
             "token":{
               "kind":"end_of_file",
               "text":"",
-              "offset":76,
+              "offset":55,
               "leading_width":0,
               "width":0,
               "trailing_width":0,
               "leading":[],
               "trailing":[],
-              "line_number":7
+              "line_number":6
             }
           }
         }
       ]
     }
   },
-  "program_text":"<?hh // partial\n\nfunction f() {\n  x(inout $_SERVER);\n  y(inout $GLOBALS);\n}\n",
-  "version":"2020-08-17-0000"
+  "program_text":"<?hh // partial\n\nfunction f() {\n  x(inout $_SERVER);\n}\n",
+  "version":"2020-09-14-0000"
 }
diff --git a/hphp/hack/test/typecheck/badglobal.php b/hphp/hack/test/typecheck/badglobal.php
deleted file mode 100644
index ade393d043c..00000000000
--- a/hphp/hack/test/typecheck/badglobal.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?hh // strict
-// Copyright 2004-present Facebook. All Rights Reserved.
-
-function foo():void {
-  $GLOBALS['bar'] = 3;
-}
diff --git a/hphp/hack/test/typecheck/badglobal.php.exp b/hphp/hack/test/typecheck/badglobal.php.exp
deleted file mode 100644
index 6117a5fd665..00000000000
--- a/hphp/hack/test/typecheck/badglobal.php.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-File "badglobal.php", line 5, characters 3-10:
-Variable `$GLOBALS` is undefined, or not always defined. (Naming[2050])
diff --git a/hphp/hack/test/typecheck/inout/bad_inout_use_globals.php b/hphp/hack/test/typecheck/inout/bad_inout_use_globals.php
deleted file mode 100644
index 74efcc617ab..00000000000
--- a/hphp/hack/test/typecheck/inout/bad_inout_use_globals.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?hh // partial
-
-function f(inout $_): void {}
-
-function test(): void {
-  f(inout $GLOBALS);
-}
diff --git a/hphp/hack/test/typecheck/inout/bad_inout_use_globals.php.exp b/hphp/hack/test/typecheck/inout/bad_inout_use_globals.php.exp
deleted file mode 100644
index 21510feea63..00000000000
--- a/hphp/hack/test/typecheck/inout/bad_inout_use_globals.php.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-File "bad_inout_use_globals.php", line 6, characters 5-18:
-You cannot decorate this argument as `inout` (Parsing[1002])
diff --git a/hphp/hack/test/typecheck/reactive/rx_superglobals10.php b/hphp/hack/test/typecheck/reactive/rx_superglobals10.php
deleted file mode 100644
index 09958f29644..00000000000
--- a/hphp/hack/test/typecheck/reactive/rx_superglobals10.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?hh // partial
-
-<<__Rx>>
-function f($x) {
-  $a = $GLOBALS['_SERVER'];
-}
diff --git a/hphp/hack/test/typecheck/reactive/rx_superglobals10.php.exp b/hphp/hack/test/typecheck/reactive/rx_superglobals10.php.exp
deleted file mode 100644
index 748cbf9178e..00000000000
--- a/hphp/hack/test/typecheck/reactive/rx_superglobals10.php.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-File "rx_superglobals10.php", line 5, characters 8-15:
-Superglobal `$GLOBALS` cannot be used in a reactive context. (Typing[4227])
-- 
2.11.4.GIT