Commit fdad5b6
deps: V8: fix filename manipulation for Windows
Backport-PR-URL: #30109
PR-URL: #28016
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>1 parent a91ed2e commit fdad5b6
3 files changed
Lines changed: 11 additions & 3 deletions
File tree
- deps/v8/src
- snapshot/embedded
- torque
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.0', | ||
| 41 | + 'v8_embedder_string': '-node.1', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -669,7 +669,11 @@ void PlatformEmbeddedFileWriterWin::DeclareExternalFilename( | |||
| 669 | 669 | // Replace any Windows style paths (backslashes) with forward | |
| 670 | 670 | // slashes. | |
| 671 | 671 | std::string fixed_filename(filename); | |
| 672 | - std::replace(fixed_filename.begin(), fixed_filename.end(), '\\', '/'); | ||
| 672 | + for (auto& c : fixed_filename) { | ||
| 673 | + if (c == '\\') { | ||
| 674 | + c = '/'; | ||
| 675 | + } | ||
| 676 | + } | ||
| 673 | 677 | fprintf(fp_, ".file %d \"%s\"\n", fileid, fixed_filename.c_str()); | |
| 674 | 678 | } | |
| 675 | 679 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -56,10 +56,14 @@ Stack<std::string> CSAGenerator::EmitBlock(const Block* block) { | |||
| 56 | 56 | } | |
| 57 | 57 | ||
| 58 | 58 | void CSAGenerator::EmitSourcePosition(SourcePosition pos, bool always_emit) { | |
| 59 | - const std::string& file = SourceFileMap::AbsolutePath(pos.source); | ||
| 59 | + std::string file = SourceFileMap::AbsolutePath(pos.source); | ||
| 60 | 60 | if (always_emit || !previous_position_.CompareStartIgnoreColumn(pos)) { | |
| 61 | 61 | // Lines in Torque SourcePositions are zero-based, while the | |
| 62 | 62 | // CodeStubAssembler and downwind systems are one-based. | |
| 63 | + for (auto& c : file) { | ||
| 64 | + if (c == '\\') | ||
| 65 | + c = '/'; | ||
| 66 | + } | ||
| 63 | 67 | out_ << " ca_.SetSourcePosition(\"" << file << "\", " | |
| 64 | 68 | << (pos.start.line + 1) << ");\n"; | |
| 65 | 69 | previous_position_ = pos; | |
0 commit comments