-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[benchmark] CheckResults with auto-generated error message #9330
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
eeckstein
merged 2 commits into
swiftlang:master
from
palimondo:check-results-error-msg
May 12, 2017
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,11 +49,31 @@ public func Random() -> Int64 { | |
return lfsrRandomGenerator.randInt() | ||
} | ||
|
||
public func CheckResults(_ resultsMatch: Bool, _ message: @autoclosure () -> String) { | ||
guard resultsMatch else { | ||
print(message()) | ||
abort() | ||
} | ||
@inline(__always) | ||
public func CheckResults( | ||
_ resultsMatch: Bool, | ||
file: StaticString = #file, | ||
function: StaticString = #function, | ||
line: Int = #line | ||
) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: closing paren here should be de-indented. |
||
guard _fastPath(resultsMatch) else { | ||
print("Incorrect result in \(function), \(file):\(line)") | ||
abort() | ||
} | ||
} | ||
|
||
// Due to potential overhead of passing closures around on the | ||
// performance measurements, this version is now deprecated | ||
@available(*, deprecated, | ||
message: "For debugging test failures only! Use the version without message.") | ||
public func CheckResults( | ||
_ resultsMatch: Bool, | ||
_ message: @autoclosure () -> String | ||
) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also here. |
||
guard resultsMatch else { | ||
print(message()) | ||
abort() | ||
} | ||
} | ||
|
||
public func False() -> Bool { return false } | ||
|
@@ -71,9 +91,3 @@ public func someProtocolFactory() -> SomeProtocol { return MyStruct() } | |
// which are using it. | ||
public func blackHole<T>(_ x: T) { | ||
} | ||
|
||
@inline(__always) | ||
public func CheckResults(_ resultsMatch: Bool) { | ||
guard _fastPath(resultsMatch) else { abort() } | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: indenting in this file is two spaces.