Reflection: Fix for last-minute fix for 32-bit platforms that broke 64-bit platforms

Author: slavapestov

include/swift/Reflection/ReflectionContext.h

@@ -385,7 +385,7 @@ class ReflectionContext
       //
       // Metadata bindings are stored consecutively at the beginning of the
       // closure context.
-      unsigned Offset = ((sizeof(StoredPointer) == 4 ? 12 : 8) +
+      unsigned Offset = ((sizeof(StoredPointer) == 4 ? 12 : 16) +
                          sizeof(StoredPointer) * Index);
 
       StoredPointer MetadataAddress;

validation-test/Reflection/functions.swift

@@ -1,6 +1,6 @@
 // RUN: rm -rf %t && mkdir -p %t
 // RUN: %target-build-swift -Xfrontend -enable-reflection-metadata -Xfrontend -enable-reflection-names -lswiftSwiftReflectionTest %s -o %t/functions
-// RUN: %target-run %target-swift-reflection-test %t/functions 2>&1 | FileCheck %s --check-prefix=CHECK-%target-ptrsize
+// RUN: %target-run %target-swift-reflection-test %t/functions 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
 // REQUIRES: objc_interop
 
 /*