---

yaml
---
r: 348807
b: refs/heads/master
c: 0996da0
h: refs/heads/master
i:
  348805: 0aad346
  348803: 9000ac2
  348799: eecd3a2

Author: Davide Italiano

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a2e0d08862274c8e2a7fef2e1fa656ac686ac676
+refs/heads/master: 0996da0ed291130e66d495129de710e2ef2858fe
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/ABI/Metadata.h

@@ -998,6 +998,8 @@ struct TargetClassMetadata : public TargetAnyClassMetadata<Runtime> {
   using StoredPointer = typename Runtime::StoredPointer;
   using StoredSize = typename Runtime::StoredSize;
 
+  friend class ReflectionContext;
+
   TargetClassMetadata() = default;
   constexpr TargetClassMetadata(const TargetAnyClassMetadata<Runtime> &base,
              ClassFlags flags,

trunk/utils/build-script-impl

@@ -2248,6 +2248,13 @@ for host in "${ALL_HOSTS[@]}"; do
                     build_tests_this_time=${SWIFT_INCLUDE_TESTS}
                 fi
 
+                if [[ $(is_cross_tools_host ${host}) ]] ; then
+                    cmake_options=(
+                        "${cmake_options[@]}"
+                        -DLLVM_TABLEGEN=$(build_directory "${LOCAL_HOST}" llvm)/bin/llvm-tblgen
+                    )
+                fi
+
                 # Command-line parameters override any autodetection that we
                 # might have done.
                 if [[ "${NATIVE_LLVM_TOOLS_PATH}" ]] ; then
@@ -2679,7 +2686,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     LIBDISPATCH_BUILD_ARGS=(
                       -DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=${LIBDISPATCH_SOURCE_DIR}
                       -DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=${LIBDISPATCH_BUILD_DIR}
-                      -Ddispatch_DIR=${LIBDISPATCH_BUILD_DIR}/cmake/modules
                     )
                 else
                     LIBDISPATCH_BUILD_ARGS=( -DFOUNDATION_ENABLE_LIBDISPATCH=NO )