Add `pie` as another `relocation-model` value #88820

hlopko · 2021-09-10T14:04:06Z

rust-highfive · 2021-09-10T14:04:09Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @wesleywiser (or someone else) soon.

Please see the contribution instructions for more information.

rust-highfive · 2021-09-10T14:04:10Z

⚠️ Warning ⚠️

These commits modify compiler targets. (See the Target Tier Policy.)

hlopko · 2021-09-10T14:52:52Z

And I discovered a bug already - external functions should not be marked dso_local. I will add a fix and a test.

src/doc/rustc/src/codegen-options/index.md

wesleywiser · 2021-09-20T15:35:54Z

r? @petrochenkov or @tmandry

src/doc/rustc/src/codegen-options/index.md

compiler/rustc_codegen_llvm/src/back/write.rs

compiler/rustc_codegen_llvm/src/context.rs

petrochenkov · 2021-09-22T14:17:59Z

Also fn link_output_kind needs to be updated to treat pie in the same way as pic.

petrochenkov · 2021-09-24T12:48:03Z

r=me with commits squashed.

hlopko · 2021-09-27T07:15:22Z

(ftr, I believe I addressed all the comments, maybe I need to comment so bors continues with the r= command?)

bjorn3 · 2021-09-27T07:34:44Z

The comments haven't been squashed into a single commit yet. Once that is done someone with review permission will need to tell bors to merge this PR.

hlopko · 2021-09-27T07:38:11Z

@bjorn3 are you saying that I should squash the commits? Or bors is going to do that?

bjorn3 · 2021-09-27T07:47:57Z

You need to squash. Bors doesn't.

hlopko · 2021-09-27T08:34:12Z

I see, thank you! Done.

bjorn3 · 2021-09-27T08:45:50Z

@bors r=petrochenkov

bors · 2021-09-27T08:45:51Z

📌 Commit d033e9b2c8d0eff1a49f4283f5c623c9503cdf10 has been approved by petrochenkov

hlopko · 2021-09-28T12:05:30Z

@bors r=petrochenkov

bors · 2021-09-28T12:05:31Z

@hlopko: 🔑 Insufficient privileges: Not in reviewers

hlopko · 2021-09-28T12:05:45Z

Had to try :)

petrochenkov · 2021-09-28T13:42:05Z

@bors r+

bors · 2021-09-28T13:42:06Z

📌 Commit dea3ee1 has been approved by petrochenkov

…petrochenkov Add `pie` as another `relocation-model` value MCP: rust-lang/compiler-team#461

Manishearth · 2021-10-01T01:05:02Z

Failed in #89411 (comment) on x86_64-apple

@bors r-

---- [codegen] codegen/pie-relocation-model.rs stdout ----

error: verification with 'FileCheck' failed
status: exit status: 1
command: "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/llvm/build/bin/FileCheck" "--input-file" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/codegen/pie-relocation-model/pie-relocation-model.ll" "/Users/runner/work/rust/rust/src/test/codegen/pie-relocation-model.rs" "--allow-unused-prefixes" "--check-prefixes" "CHECK,NONMSVC"
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
/Users/runner/work/rust/rust/src/test/codegen/pie-relocation-model.rs:7:11: error: CHECK: expected string not found in input
// CHECK: define dso_local i8 @call_foreign_fn()
          ^
/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/codegen/pie-relocation-model/pie-relocation-model.ll:1:1: note: scanning from here
; ModuleID = 'pie_relocation_model.8d7ed54a-cgu.0'
^
/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/codegen/pie-relocation-model/pie-relocation-model.ll:9:10: note: possible intended match here
 %0 = tail call zeroext i8 @foreign_fn()
         ^

Input file: /Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/codegen/pie-relocation-model/pie-relocation-model.ll
Check file: /Users/runner/work/rust/rust/src/test/codegen/pie-relocation-model.rs

-dump-input=help explains the following input dump.

Input was:
<<<<<<
           1: ; ModuleID = 'pie_relocation_model.8d7ed54a-cgu.0' 
check:7'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
           2: source_filename = "pie_relocation_model.8d7ed54a-cgu.0" 
check:7'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           3: target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" 
check:7'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           4: target triple = "x86_64-apple-macosx10.8.0" 
check:7'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           5:  
check:7'0     ~
           6: ; Function Attrs: uwtable 
check:7'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~
           7: define i8 @call_foreign_fn() unnamed_addr #0 { 
check:7'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           8: start: 
check:7'0     ~~~~~~~
           9:  %0 = tail call zeroext i8 @foreign_fn() 
check:7'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:7'1              ?                                possible intended match
          10:  ret i8 %0 
check:7'0     ~~~~~~~~~~~
          11: } 
check:7'0     ~~
          12:  
check:7'0     ~
          13: ; Function Attrs: uwtable 
check:7'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~
          14: declare zeroext i8 @foreign_fn() unnamed_addr #0 
check:7'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           .
           .
           .
>>>>>>

------------------------------------------



failures:
    [codegen] codegen/pie-relocation-model.rs

hlopko · 2021-10-01T06:11:05Z

Restricted the codegen test only to x86_64 linux, the test doesn't make sense on mac as functions are (almost?) never marked dso_local there. And I don't know of PIE makes any sense for Windows.

petrochenkov · 2021-10-01T08:29:26Z

@bors r+

bors · 2021-10-01T08:29:27Z

📌 Commit 198d907 has been approved by petrochenkov

…petrochenkov Add `pie` as another `relocation-model` value MCP: rust-lang/compiler-team#461

…arth Rollup of 6 pull requests Successful merges: - rust-lang#87868 (Added -Z randomize-layout flag) - rust-lang#88820 (Add `pie` as another `relocation-model` value) - rust-lang#89029 (feat(rustc_parse): recover from pre-RFC-2000 const generics syntax) - rust-lang#89322 (Reapply "Remove optimization_fuel_crate from Session") - rust-lang#89340 (Improve error message for `printf`-style format strings) - rust-lang#89415 (Correct caller/callsite confusion in inliner message) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned wesleywiser Sep 10, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 10, 2021

This was referenced Sep 10, 2021

Adding an option to force compiling a crate as PIE (instead of PIC) #87934

Closed

Add pie relocation-model rust-lang/compiler-team#461

Closed

This comment has been minimized.

Sign in to view

hlopko force-pushed the add_pie_relocation_model branch from 2954c0b to 23dd820 Compare September 10, 2021 16:09

This comment has been minimized.

Sign in to view

apiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 13, 2021

wesleywiser reviewed Sep 20, 2021

View reviewed changes

src/doc/rustc/src/codegen-options/index.md Outdated Show resolved Hide resolved

rust-highfive assigned petrochenkov and unassigned wesleywiser Sep 20, 2021

petrochenkov reviewed Sep 22, 2021

View reviewed changes

petrochenkov removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 22, 2021

petrochenkov added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 22, 2021

This comment has been minimized.

Sign in to view

hlopko force-pushed the add_pie_relocation_model branch from ff7d253 to d033e9b Compare September 27, 2021 07:52

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 28, 2021

Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 30, 2021

Rollup merge of rust-lang#88820 - hlopko:add_pie_relocation_model, r=…

c65a1ea

…petrochenkov Add `pie` as another `relocation-model` value MCP: rust-lang/compiler-team#461

Manishearth mentioned this pull request Sep 30, 2021

Rollup of 10 pull requests #89402

Closed

Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 30, 2021

Rollup merge of rust-lang#88820 - hlopko:add_pie_relocation_model, r=…

9ef84b4

…petrochenkov Add `pie` as another `relocation-model` value MCP: rust-lang/compiler-team#461

Manishearth mentioned this pull request Sep 30, 2021

Rollup of 9 pull requests #89411

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 1, 2021

Add pie as another relocation-model value

198d907

hlopko force-pushed the add_pie_relocation_model branch from dea3ee1 to 198d907 Compare October 1, 2021 06:06

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 1, 2021

fee1-dead added a commit to fee1-dead-contrib/rust that referenced this pull request Oct 1, 2021

Rollup merge of rust-lang#88820 - hlopko:add_pie_relocation_model, r=…

d8ffbaf

…petrochenkov Add `pie` as another `relocation-model` value MCP: rust-lang/compiler-team#461

fee1-dead mentioned this pull request Oct 1, 2021

Rollup of 8 pull requests #89420

Closed

Manishearth mentioned this pull request Oct 1, 2021

Rollup of 6 pull requests #89435

Merged

bors merged commit 6f1e930 into rust-lang:master Oct 1, 2021

rustbot added this to the 1.57.0 milestone Oct 1, 2021

Add pie as another relocation-model value #88820

Add pie as another relocation-model value #88820

Uh oh!

Conversation

hlopko commented Sep 10, 2021

Uh oh!

rust-highfive commented Sep 10, 2021

Uh oh!

rust-highfive commented Sep 10, 2021

Uh oh!

This comment has been minimized.

hlopko commented Sep 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

wesleywiser commented Sep 20, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Sep 22, 2021

Uh oh!

This comment has been minimized.

petrochenkov commented Sep 24, 2021

Uh oh!

hlopko commented Sep 27, 2021

Uh oh!

bjorn3 commented Sep 27, 2021

Uh oh!

hlopko commented Sep 27, 2021

Uh oh!

bjorn3 commented Sep 27, 2021

Uh oh!

hlopko commented Sep 27, 2021

Uh oh!

bjorn3 commented Sep 27, 2021

Uh oh!

bors commented Sep 27, 2021

Uh oh!

hlopko commented Sep 28, 2021

Uh oh!

bors commented Sep 28, 2021

Uh oh!

hlopko commented Sep 28, 2021

Uh oh!

petrochenkov commented Sep 28, 2021

Uh oh!

bors commented Sep 28, 2021

Uh oh!

Manishearth commented Oct 1, 2021

Uh oh!

hlopko commented Oct 1, 2021

Uh oh!

petrochenkov commented Oct 1, 2021

Uh oh!

bors commented Oct 1, 2021

Uh oh!

Uh oh!

Add `pie` as another `relocation-model` value #88820

Add `pie` as another `relocation-model` value #88820

hlopko commented Sep 10, 2021 •

edited

Loading