compiler: remove "DIR/../" when joining relative import path
Otherwise if DIR does not exist, the path does not work. This matches
what the gc cmd/compile tool does, because it calls path.Join.
The test for this is the cmd/go tests, to be added in a follow-up CL.
Change-Id: I27486f3795fb78a1ada1730c4e375268acf4ff65
Reviewed-on: https://go-review.googlesource.com/45691
Reviewed-by: Than McIntosh <thanm@google.com>
diff --git a/go/import.cc b/go/import.cc
index f6b4e0c..20b077f 100644
--- a/go/import.cc
+++ b/go/import.cc
@@ -82,6 +82,25 @@
// A special case.
fn = relative_import_path;
}
+ else if (fn[0] == '.' && fn[1] == '.'
+ && (fn[2] == '\0' || IS_DIR_SEPARATOR(fn[2])))
+ {
+ // We are going to join relative_import_path and fn, and it
+ // will look like DIR/../PATH. But DIR does not necessarily
+ // exist in this case, and if it doesn't the use of .. will
+ // fail although it shouldn't. The gc compiler uses
+ // path.Join here, which cleans up the .., so we need to do
+ // the same.
+ size_t index;
+ for (index = relative_import_path.length() - 1;
+ index > 0 && !IS_DIR_SEPARATOR(relative_import_path[index]);
+ index--)
+ ;
+ if (index > 0)
+ fn = relative_import_path.substr(0, index) + fn.substr(2);
+ else
+ fn = relative_import_path + '/' + fn;
+ }
else
fn = relative_import_path + '/' + fn;
is_local = false;
