---

yaml
---
r: 345131
b: refs/heads/master
c: 90c24eb
h: refs/heads/master
i:
  345129: 6c807cd
  345127: db6936f

Author: swift-ci

[refs]

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

trunk/CMakeLists.txt

@@ -866,11 +866,13 @@ endfunction()
 # package lookup.  Otherwise, rely on the paths specified by the user.  These
 # need to be defined when cross-compiling.
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  swift_icu_variables_set("${SWIFT_HOST_VARIANT_SDK_default}"
-                          "${SWIFT_HOST_VARIANT_ARCH_default}"
-                          ICU_CONFIGURED)
-  if("${SWIFT_PATH_TO_LIBICU_BUILD}" STREQUAL "" AND NOT ${ICU_CONFIGURED})
-    find_package(ICU REQUIRED COMPONENTS uc i18n)
+  if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
+    swift_icu_variables_set("${SWIFT_HOST_VARIANT_SDK_default}"
+                            "${SWIFT_HOST_VARIANT_ARCH_default}"
+                            ICU_CONFIGURED)
+    if("${SWIFT_PATH_TO_LIBICU_BUILD}" STREQUAL "" AND NOT ${ICU_CONFIGURED})
+      find_package(ICU REQUIRED COMPONENTS uc i18n)
+    endif()
   endif()
 endif()
 

trunk/include/swift/Remote/MetadataReader.h

@@ -265,12 +265,12 @@ class MetadataReader {
     return start;
   }
 
-  /// Given a pointer to an address, attemp to read the pointed value.
-  Optional<StoredPointer> readPointedValue(StoredPointer Address) {
-    StoredPointer PointedVal;
-    if (!Reader->readInteger(RemoteAddress(Address), &PointedVal))
+  /// Given a pointer to an address, attemp to read the pointer value.
+  Optional<StoredPointer> readPointerValue(StoredPointer Address) {
+    StoredPointer PointerVal;
+    if (!Reader->readInteger(RemoteAddress(Address), &PointerVal))
       return None;
-    return Optional<StoredPointer>(PointedVal);
+    return Optional<StoredPointer>(PointerVal);
   }
 
   /// Given a pointer to the metadata, attempt to read the value

trunk/lib/RemoteAST/RemoteAST.cpp

@@ -1166,10 +1166,10 @@ class RemoteASTContextConcreteImpl final : public RemoteASTContextImpl {
 
   Result<std::pair<Type, RemoteAddress>>
   getDynamicTypeAndAddressClassExistential(RemoteAddress object) {
-    auto pointed = Reader.readPointedValue(object.getAddressData());
-    if (!pointed)
+    auto pointerval = Reader.readPointerValue(object.getAddressData());
+    if (!pointerval)
       return getFailure<std::pair<Type, RemoteAddress>>();
-    auto result = Reader.readMetadataFromInstance(*pointed);
+    auto result = Reader.readMetadataFromInstance(*pointerval);
     if (!result)
       return getFailure<std::pair<Type, RemoteAddress>>();
     auto typeResult = Reader.readTypeFromMetadata(result.getValue());
@@ -1181,11 +1181,11 @@ class RemoteASTContextConcreteImpl final : public RemoteASTContextImpl {
 
   Result<std::pair<Type, RemoteAddress>>
   getDynamicTypeAndAddressErrorExistential(RemoteAddress object) {
-    auto pointed = Reader.readPointedValue(object.getAddressData());
-    if (!pointed)
+    auto pointerval = Reader.readPointerValue(object.getAddressData());
+    if (!pointerval)
       return getFailure<std::pair<Type, RemoteAddress>>();
     auto result =
-        Reader.readMetadataAndValueErrorExistential(RemoteAddress(*pointed));
+        Reader.readMetadataAndValueErrorExistential(RemoteAddress(*pointerval));
     if (!result)
       return getFailure<std::pair<Type, RemoteAddress>>();
     RemoteAddress metadataAddress = result->first;
@@ -1222,10 +1222,10 @@ class RemoteASTContextConcreteImpl final : public RemoteASTContextImpl {
     // 1) Loading a pointer from the input address
     // 2) Reading it as metadata and resolving the type
     // 3) Wrapping the resolved type in an existential metatype.
-    auto pointed = Reader.readPointedValue(object.getAddressData());
-    if (!pointed)
+    auto pointerval = Reader.readPointerValue(object.getAddressData());
+    if (!pointerval)
       return getFailure<std::pair<Type, RemoteAddress>>();
-    auto typeResult = Reader.readTypeFromMetadata(*pointed);
+    auto typeResult = Reader.readTypeFromMetadata(*pointerval);
     if (!typeResult)
       return getFailure<std::pair<Type, RemoteAddress>>();
     auto wrappedType = ExistentialMetatypeType::get(typeResult);