Address @gribozavr comments to 273b149

Author: trentxintong

stdlib/public/core/Process.swift

@@ -13,7 +13,7 @@
 public enum Process {
   /// Initialize the swift argument with the list of command-line arguments
   /// with which the current process was invoked.
-  public static func initArguments() {
+  internal static func _initArguments() {
     for i in 0..<Int(argc) {
       _arguments.append(
           String.fromCStringRepairingIllFormedUTF8(unsafeArgv[i]).0 ?? "")
@@ -25,11 +25,12 @@ public enum Process {
     UnsafeMutablePointer<UnsafeMutablePointer<Int8>>
     = nil
 
-  internal static var _arguments : [String] = [String]() 
+  internal static var _arguments: [String] = [] 
 
-  /// Access to the swift arguments.
-  public static var arguments : [String] {
-    return _arguments;
+  /// The list of command-line arguments with which the current
+  /// process was invoked.
+  public static var arguments: [String] {
+    return _arguments
   } 
 
   /// Access to the raw argc value from C.
@@ -55,8 +56,8 @@ func _didEnterMain(
   // values that were passed in to main.
   Process._argc = CInt(argc)
   Process._unsafeArgv = UnsafeMutablePointer(argv)
-
-  // Initialize the swift arguments.
-  Process.initArguments();
+  // Arguments can only be initialized after _argc and _unsafeArgv are
+  // initialized.
+  Process._initArguments();
 }
 

test/IRGen/expressions.swift

@@ -5,17 +5,18 @@
 import Swift
 
 
-// CHECK: private unnamed_addr constant [22 x i8] c"this is just a\0A\0A test\00"
+// CHECK: @[[const1:[0-9]+]] = private unnamed_addr constant [22 x i8] c"this is just a\0A\0A test\00"
+// CHECK: @[[const2:[0-9]+]] = private unnamed_addr constant [19 x i16] [i16 110, i16 111, i16 110, i16 45, i16 65, i16 83, i16 67, i16 73, i16 73, i16 32, i16 115, i16 116, i16 114, i16 105, i16 110, i16 103, i16 32, i16 181, i16 0]
 
 // CHECK: define hidden [[stringLayout:[^@]*]] @_TF11expressions17TestStringLiteralFT_SS() {{.*}} {
-// CHECK: call [[stringLayout]] @{{.*}}_builtinStringLiteral{{.*}}(i8* getelementptr inbounds ([22 x i8], [22 x i8]* @8, i64 0, i64 0), i64 21, i1 true)
+// CHECK: call [[stringLayout]] @{{.*}}_builtinStringLiteral{{.*}}(i8* getelementptr inbounds ([22 x i8], [22 x i8]* @[[const1]], i64 0, i64 0), i64 21, i1 true)
 
 func TestStringLiteral() -> String {
   return "this is just a\n\u{0a} test"
 }
 
 // CHECK: define hidden [[stringLayout]] @_TF11expressions18TestStringLiteral2FT_SS() {{.*}} {
-// CHECK: call [[stringLayout]] @{{.*}}_builtinUTF16StringLiteral{{.*}}(i8* bitcast ([19 x i16]* @9 to i8*), i64 18)
+// CHECK: call [[stringLayout]] @{{.*}}_builtinUTF16StringLiteral{{.*}}(i8* bitcast ([19 x i16]* @[[const2]] to i8*), i64 18)
 func TestStringLiteral2() -> String {
   return "non-ASCII string \u{00B5}"
 }

test/IRGen/objc_subscripts.swift

@@ -3,6 +3,7 @@
 // REQUIRES: CPU=x86_64
 // REQUIRES: objc_interop
 
+// CHECK: @[[const1:[0-9]+]] = private unnamed_addr constant [8 x i8] c"@16@0:8\00"
 // CHECK: @_INSTANCE_METHODS__TtC15objc_subscripts10SomeObject = 
 // CHECK:   private constant { i32, i32, [5 x { i8*, i8*, i8* }] } 
 // CHECK:   { i32 24, i32 5, [5 x { i8*, i8*, i8* }] 
@@ -32,7 +33,7 @@
 // CHECK:           i8* bitcast (void ([[OPAQUE6:%.*]]*, i8*, i64, [[OPAQUE7:%.*]]*)* @_TToFC15objc_subscripts10SomeObjects9subscriptFS0_Si to i8*)
 // CHECK:         },
 // CHECK:       { i8*, i8*, i8* } 
-// CHECK:         { i8* getelementptr inbounds ([5 x i8], [5 x i8]* @"\01L_selector_data(init)", i64 0, i64 0), i8* getelementptr inbounds ([8 x i8], [8 x i8]* @8, i64 0, i64 0), i8* bitcast ([[OPAQUE8:%.*]]* ([[OPAQUE9:%.*]]*, i8*)* @_TToFC15objc_subscripts10SomeObjectcfT_S0_ to i8*) }
+// CHECK:         { i8* getelementptr inbounds ([5 x i8], [5 x i8]* @"\01L_selector_data(init)", i64 0, i64 0), i8* getelementptr inbounds ([8 x i8], [8 x i8]* @[[const1]], i64 0, i64 0), i8* bitcast ([[OPAQUE8:%.*]]* ([[OPAQUE9:%.*]]*, i8*)* @_TToFC15objc_subscripts10SomeObjectcfT_S0_ to i8*) }
 // CHECK:    ]
 // CHECK:  }, section "__DATA, __objc_const", align 8