Prevent result equality comparisons for QPRGen0 runtime capabilities #449

bamarsha · 2020-06-05T04:04:12Z

To carry the runtime capabilities to the type checker, I created a new record type that contains the symbol tracker (which is what was originally passed to the type checker), the capabilities, and a couple of other things that I moved out of the symbol tracker because it didn't need them.
Tests include both QPRGen0 and QPRGen1 test cases. Failing QPRGen1 tests are skipped.

src/QsCompiler/Tests.Compiler/TestCases/CapabilityVerification.qs

bettinaheim

Overall looks good. I have a couple of comments regarding structural things.

src/QsCompiler/DataStructures/Diagnostics.fs

src/QsCompiler/CompilationManager/TypeChecking.cs

src/QsCompiler/SyntaxProcessor/ExpressionVerification.fs

src/QsCompiler/SyntaxProcessor/VerificationTools.fs

src/QsCompiler/SyntaxProcessor/ExpressionVerification.fs

src/QsCompiler/Tests.Compiler/CapabilityVerificationTests.fs

Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com>

…sha/verify-gen0 # Conflicts: # src/QsCompiler/SyntaxProcessor/ExpressionVerification.fs

no longer applies

src/QsCompiler/LanguageServer/EditorState.cs

src/QsCompiler/SyntaxProcessor/ScopeTools.fs

src/QsCompiler/DataStructures/Diagnostics.fs

src/QsCompiler/DataStructures/DataTypes.fs

bettinaheim · 2020-06-16T15:57:09Z

@SamarSha I realized this PR is going into master - could you please either retarget it to a feature branch or merge in the corresponding tests first, so that any merge to master always also includes the tests? Thanks!

bettinaheim

Let's get the tests in first before merging to master.

bamarsha · 2020-06-16T17:21:59Z

The tests for this feature are in this PR. #465 added tests for equality comparisons in general (not testing runtime capabilities), but I merged that now.

should have read more carefully

src/QsCompiler/SyntaxProcessor/ExpressionVerification.fs

* Use invariant culture for string conversions in tests (#470) * Prevent result equality comparisons for QPRGen0 runtime capabilities (#449) * Prevent result equality with QPRGen0 * Move more fields from SymbolTracker to ResolutionContext * Undo some changes to TypeChecking.cs * Move ResolutionContext up a bit * Better error message * Add basic tests * Add more tests (but not working right now...) * Fix tests * Add tests for not equals * Use static member for Create * Move ResolutionContext to SymbolTracker.fs * Update doc comment to ArgumentException Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> * Replace failwith with ArgumentException * Mention SymbolTracker versioning in ResolutionContext * Restore supportsEqualityComparison and use VerifyIsOneOf * Undo changes to VerificationTools.fs * Rename ResolutionContext to ScopeContext * Include execution target in error message * Make ScopeContext.ExecutionTarget non-nullable * Update error message Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> * Fix possible null reference in CompilationLoader (#481) * Revising the plugin mechanism for compiler steps (#472) * Classically Controlled Short Circuit Bug Fix (#478) Reordered the steps of the classically controlled rewrite to have the if-statement restructuring done first. * Don't execute rewrite steps if the validation fails (#473) * Use Uri.LocalPath instead of Uri.AbsolutePath for file IDs (#468) * Use Uri.LocalPath instead of Uri.AbsolutePath * Fix attribute reader test * Update packages to fix tests * Add GetFileId and deprecate TryGetFileId * Re-add null URI check Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> * Use OnCompilation in transformations. (#484) * Fix to reserve symbol in set statement crash (#486) * Add NoOp to Precondition Dependencies for Classically Controlled (#489) Added NoOp to precondition dependency list for classical control. * NoOp Removed from Dependency List (#490) Removed NoOp to precondition dependency list for classical control. Co-authored-by: Sarah Marshall <33814365+samarsha@users.noreply.github.com> Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> Co-authored-by: Ryan Shaffer <ryan.shaffer@microsoft.com> Co-authored-by: Scott Carda <55811729+ScottCarda-MS@users.noreply.github.com> Co-authored-by: César Zaragoza Cortés <cesar.zaragoza@outlook.com>

* Use invariant culture for string conversions in tests (#470) * Prevent result equality comparisons for QPRGen0 runtime capabilities (#449) * Prevent result equality with QPRGen0 * Move more fields from SymbolTracker to ResolutionContext * Undo some changes to TypeChecking.cs * Move ResolutionContext up a bit * Better error message * Add basic tests * Add more tests (but not working right now...) * Fix tests * Add tests for not equals * Use static member for Create * Move ResolutionContext to SymbolTracker.fs * Update doc comment to ArgumentException Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> * Replace failwith with ArgumentException * Mention SymbolTracker versioning in ResolutionContext * Restore supportsEqualityComparison and use VerifyIsOneOf * Undo changes to VerificationTools.fs * Rename ResolutionContext to ScopeContext * Include execution target in error message * Make ScopeContext.ExecutionTarget non-nullable * Update error message Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> * Fix possible null reference in CompilationLoader (#481) * Revising the plugin mechanism for compiler steps (#472) * Classically Controlled Short Circuit Bug Fix (#478) Reordered the steps of the classically controlled rewrite to have the if-statement restructuring done first. * Don't execute rewrite steps if the validation fails (#473) * Use Uri.LocalPath instead of Uri.AbsolutePath for file IDs (#468) * Use Uri.LocalPath instead of Uri.AbsolutePath * Fix attribute reader test * Update packages to fix tests * Add GetFileId and deprecate TryGetFileId * Re-add null URI check Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> * Use OnCompilation in transformations. (#484) * Fix to reserve symbol in set statement crash (#486) * Add NoOp to Precondition Dependencies for Classically Controlled (#489) Added NoOp to precondition dependency list for classical control. * NoOp Removed from Dependency List (#490) Removed NoOp to precondition dependency list for classical control. * Language Server SEMVER (#497) * Bump Markdig version. (#502) * Add SemVer 2.0 data as AssemblyInformationalVersion (#501) * Add informational version to --version. * Fix `s. * Apply suggestions from code review * Update build/build.ps1 Co-authored-by: Ryan Shaffer <ryan.shaffer@microsoft.com> * Apply suggestions from code review Co-authored-by: Ryan Shaffer <ryan.shaffer@microsoft.com> * Fixed test.ps1. Co-authored-by: Ryan Shaffer <ryan.shaffer@microsoft.com> * Use correct versions for both VS and VSCode VSIX (#500) * Use Semver.Version for VS VSIX filename * Set Semver.Version in CI * Use SEMVER_VERSION env variable in .csproj * Undo unneeded changes * Add SemverVersion property to .csproj * Use #SEMVER_VERSION# for .csproj * Improve filter * Use task.setvariable * Update VSIX_VERSION correctly * Separate VSIX version for VS and VSCode extensions * Use SEMVER_VERSION directly for VSCode vsix * Distinguishing the processor architecture and the execution target (#503) * upgraded Roslyn to 3.6.0 (#499) Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> * removing unnecessary package references (#505) Co-authored-by: Bettina Heim <beheim@microsoft.com> * Fix errors with exception handling during compilation and tests (#492) * Fix error handling in compilation loader/manager * Show original exceptions in tests * NoOp Reference Change (#494) Added NoOp to precondition verification for ClassicallyControlled. * Compile-time errors for Q# programs not supported by QPRGen1 runtime capabilities (#488) * Verify that result comparisons are in if condition * Add test cases for elif/else Result comparisons * Gen 1 result ifs can only be in operations * Un-skip QPRGen1 tests * Add new diagnostics * Messy, but most QPRGen1 tests passing * Fix diagnostic messages * Update diagnostic messages * Workaround to get diagnostics closer to the right place * Rename startOffset to rootPosition * Add test for return in nested scope * Replace FindStatements transformation with private function * Combine Offset and Range for return statements * Add QsStatement.RangeRelativeToRoot * Clean up verification * Use _ for discarded case value * Use QsStatement.ExtractAll * Use TypedExpression.Exists * Add new test cases, currently failing * Update mutable set verification * Update doc comment for TreeNode.GetRootPosition * Move verification functions to the top * Move else-block normalization to verify function * Use common base type in isResultComparison * Remove QsStatement.RangeRelativeToRoot * Add test for mutable set of tuple * Add SetReusedName test case to Unknown/Gen0 * Reformat new code in TryBuildIfStatement * Update diagnostic messages * Typo in doc comment * Remove QsNullable.ToOption * Formatting BoolLiteral * Don't use CommonBaseType * Add comment about no-derived-types assumption * Document assumptions and add tests for compound types * Remove struct tuple * Update references to ExecutionTarget * Move range conversion to CompilationManager * Fix conjugation diagnostic range Co-authored-by: Sarah Marshall <33814365+samarsha@users.noreply.github.com> Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com> Co-authored-by: Ryan Shaffer <ryan.shaffer@microsoft.com> Co-authored-by: Scott Carda <55811729+ScottCarda-MS@users.noreply.github.com> Co-authored-by: César Zaragoza Cortés <cesar.zaragoza@outlook.com> Co-authored-by: Andres Paz <anpaz@microsoft.com> Co-authored-by: Chris Granade <chgranad@microsoft.com> Co-authored-by: Filip W <wojcieszyn@gmail.com> Co-authored-by: Bettina Heim <beheim@microsoft.com>

Sarah Marshall added 8 commits June 3, 2020 18:22

Prevent result equality with QPRGen0

e647958

Move more fields from SymbolTracker to ResolutionContext

4bf68c5

Undo some changes to TypeChecking.cs

7589685

Move ResolutionContext up a bit

2064cd4

Better error message

400a7f8

Add basic tests

38fb16a

Add more tests (but not working right now...)

ded4328

Fix tests

a66da51

bamarsha requested review from ScottCarda-MS, bettinaheim and swernli June 5, 2020 04:04

Add tests for not equals

cbff168

swernli reviewed Jun 5, 2020

View reviewed changes

src/QsCompiler/Tests.Compiler/TestCases/CapabilityVerification.qs Show resolved Hide resolved

swernli approved these changes Jun 5, 2020

View reviewed changes

ScottCarda-MS approved these changes Jun 5, 2020

View reviewed changes

bettinaheim previously requested changes Jun 7, 2020

View reviewed changes

bettinaheim reviewed Jun 7, 2020

View reviewed changes

src/QsCompiler/Tests.Compiler/CapabilityVerificationTests.fs Show resolved Hide resolved

bamarsha and others added 9 commits June 10, 2020 19:27

Merge branch 'master' into samarsha/verify-gen0

99433dc

Use static member for Create

be43692

Move ResolutionContext to SymbolTracker.fs

a470a0f

Update doc comment to ArgumentException

daf37f9

Co-authored-by: bettinaheim <34236215+bettinaheim@users.noreply.github.com>

Merge remote-tracking branch 'origin/samarsha/verify-gen0' into samar…

4e03498

…sha/verify-gen0 # Conflicts: # src/QsCompiler/SyntaxProcessor/ExpressionVerification.fs

Replace failwith with ArgumentException

67785a2

Mention SymbolTracker versioning in ResolutionContext

e8cedce

Restore supportsEqualityComparison and use VerifyIsOneOf

43524a0

Undo changes to VerificationTools.fs

ecb5814

bamarsha requested a review from bettinaheim June 11, 2020 19:51

bamarsha and others added 2 commits June 15, 2020 10:24

Merge branch 'master' into samarsha/verify-gen0

2c6f86a

Rename ResolutionContext to ScopeContext

8103374

bamarsha mentioned this pull request Jun 15, 2020

Add tests for equality comparisons #465

Merged

Include execution target in error message

5b066ea

bettinaheim reviewed Jun 16, 2020

View reviewed changes

src/QsCompiler/LanguageServer/EditorState.cs Outdated Show resolved Hide resolved

bettinaheim reviewed Jun 16, 2020

View reviewed changes

src/QsCompiler/SyntaxProcessor/ScopeTools.fs Outdated Show resolved Hide resolved

bettinaheim reviewed Jun 16, 2020

View reviewed changes

src/QsCompiler/DataStructures/Diagnostics.fs Outdated Show resolved Hide resolved

bettinaheim reviewed Jun 16, 2020

View reviewed changes

src/QsCompiler/DataStructures/DataTypes.fs Outdated Show resolved Hide resolved

Make ScopeContext.ExecutionTarget non-nullable

907dda8

bettinaheim previously requested changes Jun 16, 2020

View reviewed changes

Merge branch 'master' into samarsha/verify-gen0

b19f5fb

Merge branch 'master' into samarsha/verify-gen0

b81bff9

bettinaheim approved these changes Jun 19, 2020

View reviewed changes

src/QsCompiler/SyntaxProcessor/ExpressionVerification.fs Show resolved Hide resolved

Sarah Marshall and others added 3 commits June 19, 2020 14:00

Update error message

576afe1

Merge branch 'master' into samarsha/verify-gen0

4cf5e4f

Merge branch 'master' into samarsha/verify-gen0

0709af7

bamarsha merged commit 0fe402c into master Jun 23, 2020

bamarsha deleted the samarsha/verify-gen0 branch June 23, 2020 21:33

bamarsha restored the samarsha/verify-gen0 branch June 24, 2020 17:01

bamarsha deleted the samarsha/verify-gen0 branch June 26, 2020 17:07

bamarsha mentioned this pull request Jul 28, 2020

Extensible diagnostics in design time builds #544

Open

bamarsha mentioned this pull request Aug 24, 2020

Verify runtime capabilities of callables defined in referenced libraries #586

Closed

Prevent result equality comparisons for QPRGen0 runtime capabilities #449

Prevent result equality comparisons for QPRGen0 runtime capabilities #449

Uh oh!

Conversation

bamarsha commented Jun 5, 2020

Uh oh!

Uh oh!

bettinaheim left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bettinaheim commented Jun 16, 2020

Uh oh!

bettinaheim left a comment

Choose a reason for hiding this comment

Uh oh!

bamarsha commented Jun 16, 2020

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants