Tag default array in TypeAliasReq

Summary:
As far as I can tell, the default value is always overwritten and it
triggers the provenance diagnostics instrumentation since we often don't have a
vmpc set when creating these structures.

Reviewed By: billf

Differential Revision: D20290084

fbshipit-source-id: 0db54bd82836a044ae1613aee2492d9c6d6aa82b

Author: Joseph Griego

hphp/runtime/base/array-data-inl.h

@@ -78,31 +78,31 @@ ALWAYS_INLINE ArrayData* ArrayData::Create() {
   return staticEmptyArray();
 }
 
-ALWAYS_INLINE ArrayData* ArrayData::CreateVArray() {
+ALWAYS_INLINE ArrayData* ArrayData::CreateVArray(arrprov::Tag tag /* = {} */) {
   return RO::EvalArrayProvenanceEmpty &&
          RO::EvalArrProvDVArrays
-    ? arrprov::tagStaticArr(staticEmptyVArray())
+    ? arrprov::tagStaticArr(staticEmptyVArray(), tag)
     : staticEmptyVArray();
 }
 
-ALWAYS_INLINE ArrayData* ArrayData::CreateVec() {
+ALWAYS_INLINE ArrayData* ArrayData::CreateVec(arrprov::Tag tag /* = {} */) {
   return RO::EvalArrayProvenanceEmpty &&
          RO::EvalArrProvHackArrays
-    ? arrprov::tagStaticArr(staticEmptyVecArray())
+    ? arrprov::tagStaticArr(staticEmptyVecArray(), tag)
     : staticEmptyVecArray();
 }
 
-ALWAYS_INLINE ArrayData* ArrayData::CreateDArray() {
+ALWAYS_INLINE ArrayData* ArrayData::CreateDArray(arrprov::Tag tag /* = {} */) {
   return RO::EvalArrayProvenanceEmpty &&
          RO::EvalArrProvDVArrays
-    ? arrprov::tagStaticArr(staticEmptyDArray())
+    ? arrprov::tagStaticArr(staticEmptyDArray(), tag)
     : staticEmptyDArray();
 }
 
-ALWAYS_INLINE ArrayData* ArrayData::CreateDict() {
+ALWAYS_INLINE ArrayData* ArrayData::CreateDict(arrprov::Tag tag /* = {} */) {
   return RO::EvalArrayProvenanceEmpty &&
          RO::EvalArrProvHackArrays
-    ? arrprov::tagStaticArr(staticEmptyDictArray())
+    ? arrprov::tagStaticArr(staticEmptyDictArray(), tag)
     : staticEmptyDictArray();
 }
 

hphp/runtime/base/array-data.h

@@ -148,11 +148,11 @@ struct ArrayData : MaybeCountable {
    * Create a new empty ArrayData with the appropriate ArrayKind.
    */
   static ArrayData* Create();
-  static ArrayData* CreateVec();
-  static ArrayData* CreateDict();
+  static ArrayData* CreateVec(arrprov::Tag tag = {});
+  static ArrayData* CreateDict(arrprov::Tag tag = {});
   static ArrayData* CreateKeyset();
-  static ArrayData* CreateVArray();
-  static ArrayData* CreateDArray();
+  static ArrayData* CreateVArray(arrprov::Tag tag = {});
+  static ArrayData* CreateDArray(arrprov::Tag tag = {});
 
   /*
    * Create a new kPackedKind ArrayData with a single element, `value'.

hphp/runtime/vm/type-alias.h

@@ -55,7 +55,7 @@ struct TypeAlias {
   AnnotType type;
   bool nullable;  // null is allowed; for ?Foo aliases
   UserAttributeMap userAttrs;
-  Array typeStructure{Array::CreateDArray()};
+  Array typeStructure{ArrayData::CreateDArray(ARRPROV_HERE())};
 
   template<class SerDe>
   typename std::enable_if<!SerDe::deserializing>::type
@@ -135,7 +135,7 @@ struct TypeAliasReq {
   LowPtr<RecordDesc> rec{nullptr};
   // Needed for error messages; nullptr if not defined.
   LowStringPtr name{nullptr};
-  Array typeStructure{Array::CreateDArray()};
+  Array typeStructure{ArrayData::CreateDArray(ARRPROV_HERE())};
   UserAttributeMap userAttrs;
   Unit* unit{nullptr};
 };