[mandatory-inlining] Update for ownership. #22085

gottesmm · 2019-01-24T06:19:04Z

This is rebased from many months ago with some small updates for recent work by
Arnold.

This is rebased from many months ago with some small updates for recent work by Arnold.

gottesmm · 2019-01-24T06:19:13Z

@swift-ci test

gottesmm · 2019-01-24T06:19:23Z

@swift-ci test source compatibility

gottesmm · 2019-01-24T07:58:51Z

The failure in the Debug Source Compat Suite is a UPASS.

swift-ci · 2019-01-24T08:46:54Z

Build failed
Swift Test OS X Platform
Git Sha - 188551c

aschwaighofer · 2019-01-24T16:49:41Z

lib/SILOptimizer/Mandatory/MandatoryInlining.cpp

+      ownership::ErrorBehaviorKind::ReturnFalseOnLeakAssertOtherwise;
+
+  // Ok, at this point we know that we have a direct SSA relationship in between
+  // our partial_apply and


aschwaighofer · 2019-01-24T16:49:51Z

lib/SILOptimizer/Mandatory/MandatoryInlining.cpp

+    }
+
+    // If we have an owned value, we need to insert a copy here for lifetime
+    // extension purposes.


Could we improve the comment: If we have an owned value, we insert the copy for two purposes: first, to balance the consuming argument, this also has the effect to satisfy the second purpose of extending the lifetime.

aschwaighofer

looks good to me

gottesmm · 2019-01-26T01:55:31Z

@swift-ci test macOS platform

gottesmm · 2019-01-26T06:06:23Z

@aschwaighofer I am going to fix the changes you suggested post-commit.

benrimmington · 2019-01-27T17:10:11Z

@gottesmm Two tests are failing for me locally:

SILOptimizer/mandatory_inlining.sil

FAIL: Swift(macosx-x86_64) :: SILOptimizer/mandatory_inlining.sil (1 of 2)
******************** TEST 'Swift(macosx-x86_64) :: SILOptimizer/mandatory_inlining.sil' FAILED ********************
Script:
--
: 'RUN: at line 1';   xcrun --toolchain default --sdk '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk' /Users/benrimmington/Repositories/apple/build/Ninja-DebugAssert/swift-macosx-x86_64/bin/sil-opt -target x86_64-apple-macosx10.9  -module-cache-path '/Users/benrimmington/Repositories/apple/build/Ninja-DebugAssert/swift-macosx-x86_64/swift-test-results/x86_64-apple-macosx10.9/clang-module-cache'  -enable-objc-interop -module-name mandatory_inlining -enable-sil-verify-all /Users/benrimmington/Repositories/apple/swift/test/SILOptimizer/mandatory_inlining.sil -mandatory-inlining | '/usr/bin/python' '/Users/benrimmington/Repositories/apple/swift/utils/PathSanitizingFileCheck' --sanitize BUILD_DIR='/Users/benrimmington/Repositories/apple/build/Ninja-DebugAssert/swift-macosx-x86_64' --sanitize SOURCE_DIR='/Users/benrimmington/Repositories/apple/swift' --use-filecheck '/Users/benrimmington/Repositories/apple/build/Ninja-DebugAssert/llvm-macosx-x86_64/bin/FileCheck' /Users/benrimmington/Repositories/apple/swift/test/SILOptimizer/mandatory_inlining.sil
--
Exit Code: 1

Command Output (stderr):
--
/Users/benrimmington/Repositories/apple/swift/test/SILOptimizer/mandatory_inlining.sil:608:12: error: CHECK: expected string not found in input
 // CHECK: [[ADDR4:%.*]] = project_box [[VAL4:%.*]] :
           ^
<stdin>:577:2: note: scanning from here
 %29 = apply %26() : $@callee_owned () -> Bool // user: %30
 ^
<stdin>:577:14: note: possible intended match here
 %29 = apply %26() : $@callee_owned () -> Bool // user: %30
             ^
/Users/benrimmington/Repositories/apple/swift/test/SILOptimizer/mandatory_inlining.sil:654:12: error: CHECK: expected string not found in input
 // CHECK: [[ADDR4:%.*]] = project_box [[VAL4:%[0-9]+]]
           ^
<stdin>:629:2: note: scanning from here
 %30 = apply %27() : $@callee_owned () -> Bool // user: %31
 ^
<stdin>:630:8: note: possible intended match here
 br bb3(%30 : $Bool) // id: %31
       ^

--

********************

SILOptimizer/mandatory_inlining_ownership2.sil

FAIL: Swift(macosx-x86_64) :: SILOptimizer/mandatory_inlining_ownership2.sil (2 of 2)
******************** TEST 'Swift(macosx-x86_64) :: SILOptimizer/mandatory_inlining_ownership2.sil' FAILED ********************
Script:
--
: 'RUN: at line 1';   xcrun --toolchain default --sdk '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk' /Users/benrimmington/Repositories/apple/build/Ninja-DebugAssert/swift-macosx-x86_64/bin/sil-opt -target x86_64-apple-macosx10.9  -module-cache-path '/Users/benrimmington/Repositories/apple/build/Ninja-DebugAssert/swift-macosx-x86_64/swift-test-results/x86_64-apple-macosx10.9/clang-module-cache'  -enable-sil-ownership -enable-objc-interop -module-name mandatory_inlining -enable-sil-verify-all /Users/benrimmington/Repositories/apple/swift/test/SILOptimizer/mandatory_inlining_ownership2.sil -mandatory-inlining | '/usr/bin/python' '/Users/benrimmington/Repositories/apple/swift/utils/PathSanitizingFileCheck' --sanitize BUILD_DIR='/Users/benrimmington/Repositories/apple/build/Ninja-DebugAssert/swift-macosx-x86_64' --sanitize SOURCE_DIR='/Users/benrimmington/Repositories/apple/swift' --use-filecheck '/Users/benrimmington/Repositories/apple/build/Ninja-DebugAssert/llvm-macosx-x86_64/bin/FileCheck' /Users/benrimmington/Repositories/apple/swift/test/SILOptimizer/mandatory_inlining_ownership2.sil
--
Exit Code: 1

Command Output (stderr):
--
/Users/benrimmington/Repositories/apple/swift/test/SILOptimizer/mandatory_inlining_ownership2.sil:600:11: error: CHECK: expected string not found in input
// CHECK: [[BOX2_COPY_COPY:%.*]] = copy_value [[BOX2_COPY]]
          ^
<stdin>:551:22: note: scanning from here
 %10 = copy_value %4 : ${ var Bool } // user: %11
                     ^
<stdin>:551:22: note: with variable "BOX2_COPY" equal to "%10"
 %10 = copy_value %4 : ${ var Bool } // user: %11
                     ^
<stdin>:560:18: note: possible intended match here
 // function_ref get_logic_value
                 ^
/Users/benrimmington/Repositories/apple/swift/test/SILOptimizer/mandatory_inlining_ownership2.sil:647:11: error: CHECK: expected string not found in input
// CHECK: [[BOX2_COPY_COPY:%.*]] = copy_value [[BOX2_COPY]]
          ^
<stdin>:601:22: note: scanning from here
 %10 = copy_value %4 : ${ var Bool } // user: %11
                     ^
<stdin>:601:22: note: with variable "BOX2_COPY" equal to "%10"
 %10 = copy_value %4 : ${ var Bool } // user: %11
                     ^
<stdin>:603:2: note: possible intended match here
 %12 = copy_value %11 : $@callee_owned () -> Bool // user: %18
 ^

--

********************

gottesmm · 2019-01-27T18:17:04Z

@benrimmington Thanks. I am already aware of this/investigating. What is weird is that this isn't failing on ci.swift.org AFAIKT.

gottesmm · 2019-01-27T20:30:06Z

@benrimmington undefined behavior strikes again! I didn't null initialize a pointer that needed to be null initialize (we need to setup a ub-san bot for swift).

gottesmm · 2019-01-27T20:35:07Z

@benrimmington #22163

[mandatory-inlining] Update for ownership.

188551c

This is rebased from many months ago with some small updates for recent work by Arnold.

gottesmm requested review from atrick and aschwaighofer January 24, 2019 06:19

aschwaighofer reviewed Jan 24, 2019

View reviewed changes

aschwaighofer approved these changes Jan 24, 2019

View reviewed changes

gottesmm merged commit 05b6ace into swiftlang:master Jan 26, 2019

gottesmm deleted the pr-7a133e2f8de39c6e863d7fc48daf761e36994bfa branch January 26, 2019 06:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[mandatory-inlining] Update for ownership. #22085

[mandatory-inlining] Update for ownership. #22085

Uh oh!

gottesmm commented Jan 24, 2019

Uh oh!

gottesmm commented Jan 24, 2019

Uh oh!

gottesmm commented Jan 24, 2019

Uh oh!

gottesmm commented Jan 24, 2019

Uh oh!

swift-ci commented Jan 24, 2019

Uh oh!

aschwaighofer Jan 24, 2019

Uh oh!

aschwaighofer Jan 24, 2019

Uh oh!

aschwaighofer left a comment

Uh oh!

gottesmm commented Jan 26, 2019

Uh oh!

gottesmm commented Jan 26, 2019

Uh oh!

benrimmington commented Jan 27, 2019

Uh oh!

gottesmm commented Jan 27, 2019

Uh oh!

gottesmm commented Jan 27, 2019

Uh oh!

gottesmm commented Jan 27, 2019

Uh oh!

Uh oh!

[mandatory-inlining] Update for ownership. #22085

[mandatory-inlining] Update for ownership. #22085

Uh oh!

Conversation

gottesmm commented Jan 24, 2019

Uh oh!

gottesmm commented Jan 24, 2019

Uh oh!

gottesmm commented Jan 24, 2019

Uh oh!

gottesmm commented Jan 24, 2019

Uh oh!

swift-ci commented Jan 24, 2019

Uh oh!

aschwaighofer Jan 24, 2019

Choose a reason for hiding this comment

Uh oh!

aschwaighofer Jan 24, 2019

Choose a reason for hiding this comment

Uh oh!

aschwaighofer left a comment

Choose a reason for hiding this comment

Uh oh!

gottesmm commented Jan 26, 2019

Uh oh!

gottesmm commented Jan 26, 2019

Uh oh!

benrimmington commented Jan 27, 2019

Uh oh!

gottesmm commented Jan 27, 2019

Uh oh!

gottesmm commented Jan 27, 2019

Uh oh!

gottesmm commented Jan 27, 2019

Uh oh!

Uh oh!