Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit f789d91a76af · 2018-06-19T11:49:47.000-07:00
diff --git a/stdlib/public/Reflection/TypeRefBuilder.cpp b/stdlib/public/Reflection/TypeRefBuilder.cpp
@@ -160,6 +160,7 @@ TypeRefBuilder::getFieldTypeInfo(const TypeRef *TR) {
       auto CandidateMangledName = FD.getMangledTypeName(TypeRefOffset);
       auto NormalizedName = normalizeReflectionName(Dem, CandidateMangledName);
       FieldTypeInfoCache[NormalizedName] = {&FD, &Info};
+      Dem.clear();
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ TypeRefBuilder::getFieldTypeInfo(const TypeRef *TR) {`
`160`	`160`	`auto CandidateMangledName = FD.getMangledTypeName(TypeRefOffset);`
`161`	`161`	`auto NormalizedName = normalizeReflectionName(Dem, CandidateMangledName);`
`162`	`162`	`FieldTypeInfoCache[NormalizedName] = {&FD, &Info};`
	`163`	`+ Dem.clear();`
`163`	`164`	`}`
`164`	`165`	`}`
`165`	`166`