From: Alexis Imperial-Legrand <ail@google.com>
Date: Tue, 10 Sep 2013 17:00:08 +0000 (-0400)
Subject: runtime: explicit init of runtime-gdb helpers
X-Git-Tag: go1.2rc2~283
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=927b7ac327a5c7f2b318b9ee0753574342d59d89;p=gostls13.git

runtime: explicit init of runtime-gdb helpers

If using other gdb python scripts loaded before Go's gdb-runtime.py
and that have a different init prototype:
Traceback (most recent call last):
  File "/usr/lib/go/src/pkg/runtime/runtime-gdb.py", line 446, in <module>
    k()
TypeError: __init__() takes exactly 3 arguments (1 given)

The problem is that gdb keeps all python scripts in the same namespace,
so vars() contains them. To avoid that, load helpers one by one.

R=iant, rsc
CC=gobot, golang-dev
https://golang.org/cl/9752044
---

diff --git a/src/pkg/runtime/runtime-gdb.py b/src/pkg/runtime/runtime-gdb.py
index cb70ca028e..e704f4c4b4 100644
--- a/src/pkg/runtime/runtime-gdb.py
+++ b/src/pkg/runtime/runtime-gdb.py
@@ -436,6 +436,9 @@ class GoIfaceCmd(gdb.Command):
 #
 # Register all convenience functions and CLI commands
 #
-for k in vars().values():
-	if hasattr(k, 'invoke'):
-		k()
+GoLenFunc()
+GoCapFunc()
+DTypeFunc()
+GoroutinesCmd()
+GoroutineCmd()
+GoIfaceCmd()