go/gcimporter15: revert user-visible changes related to aliases

Reason: Decision to back out current alias implementation.
For golang/go#16339 (comment).

Change-Id: Id2a394d78a8661c767bcc05370b81f79d9bfb714
Reviewed-on: https://go-review.googlesource.com/32756
Run-TryBot: Robert Griesemer <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Chris Manghane <[email protected]>
Reviewed-by: Matthew Dempsky <[email protected]>

Author: griesemer

go/gcimporter15/bexport.go

@@ -203,19 +203,20 @@ func (p *exporter) obj(obj types.Object) {
 		p.paramList(sig.Params(), sig.Variadic())
 		p.paramList(sig.Results(), false)
 
-	case *types_Alias:
-		// make sure the original is exported before the alias
-		// (if the alias declaration was invalid, orig will be nil)
-		orig := original(obj)
-		if orig != nil && !p.reexported[orig] {
-			p.obj(orig)
-			p.reexported[orig] = true
-		}
-
-		p.tag(aliasTag)
-		p.pos(obj)
-		p.string(obj.Name())
-		p.qualifiedName(orig)
+	// Alias-related code. Keep for now.
+	// case *types_Alias:
+	// 	// make sure the original is exported before the alias
+	// 	// (if the alias declaration was invalid, orig will be nil)
+	// 	orig := original(obj)
+	// 	if orig != nil && !p.reexported[orig] {
+	// 		p.obj(orig)
+	// 		p.reexported[orig] = true
+	// 	}
+
+	// 	p.tag(aliasTag)
+	// 	p.pos(obj)
+	// 	p.string(obj.Name())
+	// 	p.qualifiedName(orig)
 
 	default:
 		log.Fatalf("gcimporter: unexpected object %v (%T)", obj, obj)

go/gcimporter15/bexport18_test.go

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build go1.8
+// Alias-related code. Keep for now.
+// +build ignore
 
 package gcimporter_test
 
@@ -16,7 +17,7 @@ import (
 	gcimporter "golang.org/x/tools/go/gcimporter15"
 )
 
-func TestInvalidAlias(t *testing.T) {
+func disabledTestInvalidAlias(t *testing.T) {
 	// parse and typecheck
 	const src = "package p; func InvalidAlias => foo.f"
 	fset1 := token.NewFileSet()

go/gcimporter15/bimport.go

@@ -288,7 +288,11 @@ func (p *importer) obj(tag int) {
 		if pkg, name := p.qualifiedName(); pkg != nil {
 			orig = pkg.Scope().Lookup(name)
 		}
-		p.declare(types_NewAlias(pos, p.pkgList[0], name, orig))
+		// Alias-related code. Keep for now.
+		_ = pos
+		_ = name
+		_ = orig
+		// p.declare(types_NewAlias(pos, p.pkgList[0], name, orig))
 
 	default:
 		errorf("unexpected object tag %d", tag)

go/gcimporter15/gcimporter_test.go

@@ -130,6 +130,8 @@ func testDir(t *testing.T, dir string, endTime time.Time) (nimports int) {
 	return
 }
 
+const testfile = "exports.go"
+
 func TestImportTestdata(t *testing.T) {
 	// This package only handles gc export data.
 	if runtime.Compiler != "gc" {