Skip to content

[LLVM] Avoid losing the !nonnull attribute in SROA - #43026

Merged
bors merged 1 commit into
rust-lang:masterfrom
arielb1:llvm-next
Jul 14, 2017
Merged

[LLVM] Avoid losing the !nonnull attribute in SROA#43026
bors merged 1 commit into
rust-lang:masterfrom
arielb1:llvm-next

Conversation

@arielb1

@arielb1arielb1 commented Jul 3, 2017

Copy link
Copy Markdown
Contributor

@arielb1

arielb1 commented Jul 3, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=alexcrichton

@bors

bors commented Jul 3, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3723e86 has been approved by alexcrichton

@arielb1

arielb1 commented Jul 3, 2017

Copy link
Copy Markdown
ContributorAuthor

(added missing min-llvm-version)

@bors r=alexcrichton

@bors

bors commented Jul 3, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit ec40c23 has been approved by alexcrichton

@bors

bors commented Jul 4, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ec40c2308389b54d2a84efb7fb6c07cd839d5e6a with merge a93e67ec34806ff6440f760a59113f18e9e6ba9c...

@bors

bors commented Jul 4, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@aidanhs

aidanhs commented Jul 5, 2017

Copy link
Copy Markdown
Contributor
[00:50:00] ---- [codegen] codegen/issue-37945.rs stdout ----
[00:50:00] [00:50:00] error: verification with 'FileCheck' failed
[00:50:00] status: exit code: 1
[00:50:00] command: /checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck -input-file=/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/issue-37945.ll /checkout/src/test/codegen/issue-37945.rs
[00:50:00] stdout:
[00:50:00] ------------------------------------------
[00:50:00] [00:50:00] ------------------------------------------
[00:50:00] stderr:
[00:50:00] ------------------------------------------
[00:50:00] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/issue-37945.ll:19:12: error: CHECK-NOT: string occurred!
[00:50:00] %phitmp = icmp eq float* %2, null
[00:50:00] ^
[00:50:00] /checkout/src/test/codegen/issue-37945.rs:23:15: note: CHECK-NOT: pattern specified here
[00:50:00] // CHECK-NOT: icmp eq float* {{.*}}, null

@aidanhsaidanhs added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 5, 2017
@bors

bors commented Jul 6, 2017

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #42727) made this pull request unmergeable. Please resolve the merge conflicts.

@arielb1

arielb1 commented Jul 8, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Umm... this works on x86. What's the problem on ARM? I'll investigate now that I'm back.

@arielb1

arielb1 commented Jul 10, 2017

Copy link
Copy Markdown
ContributorAuthor

Looks like LLVM casts pointers to integers on 32-bit archs when loading, so I might need to implement the interconversion between range <-> nonnull there too.

@arielb1arielb1 mentioned this pull request Jul 11, 2017
Closed
@arielb1

arielb1 commented Jul 11, 2017

Copy link
Copy Markdown
ContributorAuthor

status:

I have a patch that makes this work on 32-bit archs, now I just need to make it publication-ready and get in touch with @chandlerc.

@arielb1

arielb1 commented Jul 11, 2017

Copy link
Copy Markdown
ContributorAuthor

However, maybe I should just land this change now, ignoring 32-bit archs?

@alexcrichton

alexcrichton commented Jul 11, 2017

Copy link
Copy Markdown
Member

Ignoring seems fine to me

@arielb1
[LLVM] Avoid losing the !nonnull attribute in SROA
ecf62e4
This still does not work on 32-bit archs because of an LLVM limitation,
but this is only an optimization, so let's push it on 64-bit only for now.
Fixesrust-lang#37945
@arielb1

arielb1 commented Jul 12, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=alexcrichton

@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit ecf62e4 has been approved by alexcrichton

@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ecf62e4 with merge 003edc323a9c3b05531f40dce009f7adb7f95dd3...

@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytmkennytm mentioned this pull request Jul 12, 2017
Merged
@Mark-Simulacrum

Mark-Simulacrum commented Jul 12, 2017

Copy link
Copy Markdown
Member

@bors retry -- android disk space

@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ecf62e4 with merge a3369fe9728849c15ec5477c524c9a989ae70314...

@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors: retry

@bors

bors commented Jul 14, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ecf62e4 with merge 20f77c6...

bors added a commit that referenced this pull request Jul 14, 2017
@bors
Auto merge of#43026- arielb1:llvm-next, r=alexcrichton
20f77c6
[LLVM] Avoid losing the !nonnull attribute in SROA
Fixes#37945.
r? @alexcrichton
@bors

bors commented Jul 14, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 20f77c6 to master...

@bors
bors merged commit ecf62e4 into rust-lang:masterJul 14, 2017
@jonas-schievinkjonas-schievink mentioned this pull request Jul 23, 2017
Closed
@mguentnermguentner mentioned this pull request Oct 5, 2017
Merged
17 tasks
mguentner added a commit to mguentner/nixpkgs that referenced this pull request Oct 6, 2017
@mguentner
rust: build with bundled llvm
497e146
the rust project has forked the llvm compiler to solve some
issues.
With pkgs.llvm the test suite fails.
See rust-lang/rust#43026
And PR NixOS#30088
zimbatm added a commit to zimbatm/nixpkgs that referenced this pull request Oct 22, 2017
@zimbatm
rust: 1.17.0 -> 1.20.0
7bd191d
simplify the boostrap hashes a bit
build with bundled llvm:
the rust project has forked the llvm compiler to solve some
issues.
With pkgs.llvm the test suite fails.
See rust-lang/rust#43026
And PR NixOS#30088
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@arielb1@bors@aidanhs@alexcrichton@Mark-Simulacrum