Skip to content

Commit eff9b01

Browse files
authored
Merge pull request #1204 from bloomberg/assert_fales_no_abs_name_unless_necessary_with_absname
fix #1201, only -absname passed, assert false will generate absoltue path
2 parents 48060f3 + eaea5f8 commit eff9b01

File tree

4 files changed

+38
-1
lines changed

4 files changed

+38
-1
lines changed

.vscode/c_cpp_properties.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Mac",
5+
"includePath": ["/usr/include", "/Users/hzhang295/.opam/4.02.3+local-git-master/lib/ocaml/caml"],
6+
"browse" : {
7+
"limitSymbolsToIncludedHeaders" : true,
8+
"databaseFilename" : ""
9+
}
10+
},
11+
{
12+
"name": "Linux",
13+
"includePath": ["/usr/include"],
14+
"browse" : {
15+
"limitSymbolsToIncludedHeaders" : true,
16+
"databaseFilename" : ""
17+
}
18+
},
19+
{
20+
"name": "Win32",
21+
"includePath": ["c:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include"],
22+
"browse" : {
23+
"limitSymbolsToIncludedHeaders" : true,
24+
"databaseFilename" : ""
25+
}
26+
}
27+
]
28+
}

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// Place your settings in this file to overwrite default and user settings.
2+
{
3+
"debug.inlineValues": true
4+
}

jscomp/bin/whole_compiler.ml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76786,6 +76786,11 @@ let primitive_is_ccall = function
7678676786
let assert_failed exp =
7678776787
let (fname, line, char) =
7678876788
Location.get_pos_info exp.exp_loc.Location.loc_start in
76789+
76790+
let fname =
76791+
if not !Location.absname then Filename.basename fname else fname
76792+
in
76793+
7678976794
Lprim(Praise Raise_regular, [event_after exp
7679076795
(Lprim(Pmakeblock(0, Lambda.default_tag_info, Immutable),
7679176796
[transl_normal_path Predef.path_assert_failure;

ocaml

Submodule ocaml updated from c29feb0 to 2b98db8

0 commit comments

Comments
 (0)