summaryrefslogtreecommitdiff
path: root/deps/v8
diff options
context:
space:
mode:
authorRefael Ackermann <refack@gmail.com>2019-03-31 11:53:24 -0400
committerMyles Borins <myles.borins@gmail.com>2019-10-07 03:19:38 -0400
commitacd77cc8699df28564228e51f6cd4a88a8376d46 (patch)
tree8b5c2758ec575f7897919c8e3b572b46094d8983 /deps/v8
parent7fcc1f7047d325d611c2666d9f8394a68927c5d2 (diff)
downloadandroid-node-v8-acd77cc8699df28564228e51f6cd4a88a8376d46.tar.gz
android-node-v8-acd77cc8699df28564228e51f6cd4a88a8376d46.tar.bz2
android-node-v8-acd77cc8699df28564228e51f6cd4a88a8376d46.zip
deps: V8: fix filename manipulation for Windows
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps/v8')
-rw-r--r--deps/v8/src/snapshot/embedded/platform-embedded-file-writer-win.cc6
-rw-r--r--deps/v8/src/torque/csa-generator.cc6
2 files changed, 10 insertions, 2 deletions
diff --git a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-win.cc b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-win.cc
index 9a9a26fbd0..887cbf0dbe 100644
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-win.cc
+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-win.cc
@@ -669,7 +669,11 @@ void PlatformEmbeddedFileWriterWin::DeclareExternalFilename(
// Replace any Windows style paths (backslashes) with forward
// slashes.
std::string fixed_filename(filename);
- std::replace(fixed_filename.begin(), fixed_filename.end(), '\\', '/');
+ for (auto& c : fixed_filename) {
+ if (c == '\\') {
+ c = '/';
+ }
+ }
fprintf(fp_, ".file %d \"%s\"\n", fileid, fixed_filename.c_str());
}
diff --git a/deps/v8/src/torque/csa-generator.cc b/deps/v8/src/torque/csa-generator.cc
index 0c49033955..7925783914 100644
--- a/deps/v8/src/torque/csa-generator.cc
+++ b/deps/v8/src/torque/csa-generator.cc
@@ -56,10 +56,14 @@ Stack<std::string> CSAGenerator::EmitBlock(const Block* block) {
}
void CSAGenerator::EmitSourcePosition(SourcePosition pos, bool always_emit) {
- const std::string& file = SourceFileMap::AbsolutePath(pos.source);
+ std::string file = SourceFileMap::AbsolutePath(pos.source);
if (always_emit || !previous_position_.CompareStartIgnoreColumn(pos)) {
// Lines in Torque SourcePositions are zero-based, while the
// CodeStubAssembler and downwind systems are one-based.
+ for (auto& c : file) {
+ if (c == '\\')
+ c = '/';
+ }
out_ << " ca_.SetSourcePosition(\"" << file << "\", "
<< (pos.start.line + 1) << ");\n";
previous_position_ = pos;