---

yaml
---
r: 345135
b: refs/heads/master
c: b4c67c2
h: refs/heads/master
i:
  345133: aff53f3
  345131: 371b820
  345127: db6936f
  345119: d0a53df

Author: swift-ci

[refs]

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

trunk/stdlib/public/runtime/CMakeLists.txt

@@ -57,6 +57,7 @@ set(swift_runtime_sources
     ImageInspectionELF.cpp
     ImageInspectionCOFF.cpp
     KnownMetadata.cpp
+    LLVMSupport.cpp
     Metadata.cpp
     MetadataLookup.cpp
     MutexPThread.cpp

trunk/stdlib/public/runtime/LLVMSupport.cpp

@@ -0,0 +1,23 @@
+//===--- LLVMSupport.cpp - Swift Language ABI Metadata Support ------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+// ADT uses report_bad_alloc_error to report an error when it can't allocate
+// elements for a data structure. The swift runtime uses ADT without linking
+// against libSupport, so here we provide a stub to make sure we don't fail
+// to link.
+#if defined(swiftCore_EXPORTS)
+namespace llvm {
+void __attribute__((__weak__, __visibility__("hidden")))
+report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {}
+} // end namespace llvm
+#endif
+

trunk/stdlib/public/runtime/Private.h

@@ -333,14 +333,4 @@ class TypeInfo {
 
 } // end namespace swift
 
-// ADT uses report_bad_alloc_error to report an error when it can't allocate
-// elements for a data structure. The swift runtime uses ADT without linking
-// against libSupport, so here we provide a stub to make sure we don't fail
-// to link. Give it `weak` linkage so, in case the `strong` definition of
-// the function is available, that has precedence.
-namespace llvm {
-  __attribute__((weak))
-  void report_bad_alloc_error(const char *Reason, bool GenCrashDiag) {};
-} // end namespace llvm
-
 #endif /* SWIFT_RUNTIME_PRIVATE_H */