Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use BUILD_PATH_PREFIX_MAP when compiling primitives #1856

Merged
merged 4 commits into from Jun 27, 2018
Merged

Use BUILD_PATH_PREFIX_MAP when compiling primitives #1856

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff0b4d2
Use the information from `BUILD_PATH_PREFIX_MAP` when compiling primi…
xclerc Jun 22, 2018
24300b9
Apply the rewrite only to absolute paths.
xclerc Jun 22, 2018
03794a4
Change log entry
xclerc Jun 27, 2018
ed1b260
Merge branch 'trunk' into build-path-prefix-map-prims
gasche Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions bytecomp/translprim.ml
View file
Open in desktop
Expand Up @@ -584,6 +584,11 @@ let comparison_primitive comparison comparison_kind =
let lambda_of_loc kind loc =
let loc_start = loc.Location.loc_start in
let (file, lnum, cnum) = Location.get_pos_info loc_start in
let file =
if Filename.is_relative file then
file
else
Location.rewrite_absolute_path file in
let enum = loc.Location.loc_end.Lexing.pos_cnum -
loc_start.Lexing.pos_cnum + cnum in
match kind with
Expand Down