Permalink
Browse files

[sgen] Properly fix bridge internal memory tag.

We're using two different hash tables in the bridge code.  I missed
one.
  • Loading branch information...
1 parent 0de6739 commit be0ba1db5eadbfee5aad8adbc60fb9f8506d409c @schani schani committed Oct 16, 2012
Showing with 5 additions and 1 deletion.
  1. +1 −1 mono/metadata/sgen-bridge.c
  2. +2 −0 mono/metadata/sgen-gc.h
  3. +2 −0 mono/metadata/sgen-internal.c
View
2 mono/metadata/sgen-bridge.c
@@ -599,7 +599,7 @@ sgen_bridge_processing_finish (int generation)
HashEntry **all_entries;
MonoGCBridgeSCC **api_sccs;
MonoGCBridgeXRef *api_xrefs;
- SgenHashTable alive_hash = SGEN_HASH_TABLE_INIT (INTERNAL_MEM_BRIDGE_DATA, INTERNAL_MEM_BRIDGE_DATA, 1, mono_aligned_addr_hash, NULL);
+ SgenHashTable alive_hash = SGEN_HASH_TABLE_INIT (INTERNAL_MEM_BRIDGE_ALIVE_HASH_TABLE, INTERNAL_MEM_BRIDGE_ALIVE_HASH_TABLE_ENTRY, 1, mono_aligned_addr_hash, NULL);
SGEN_TV_DECLARE (atv);
SGEN_TV_DECLARE (btv);
View
2 mono/metadata/sgen-gc.h
@@ -428,6 +428,8 @@ enum {
INTERNAL_MEM_BRIDGE_DATA,
INTERNAL_MEM_BRIDGE_HASH_TABLE,
INTERNAL_MEM_BRIDGE_HASH_TABLE_ENTRY,
+ INTERNAL_MEM_BRIDGE_ALIVE_HASH_TABLE,
+ INTERNAL_MEM_BRIDGE_ALIVE_HASH_TABLE_ENTRY,
INTERNAL_MEM_JOB_QUEUE_ENTRY,
INTERNAL_MEM_TOGGLEREF_DATA,
INTERNAL_MEM_MAX
View
2 mono/metadata/sgen-internal.c
@@ -109,6 +109,8 @@ description_for_type (int type)
case INTERNAL_MEM_BRIDGE_DATA: return "bridge-data";
case INTERNAL_MEM_BRIDGE_HASH_TABLE: return "bridge-hash-table";
case INTERNAL_MEM_BRIDGE_HASH_TABLE_ENTRY: return "bridge-hash-table-entry";
+ case INTERNAL_MEM_BRIDGE_ALIVE_HASH_TABLE: return "bridge-alive-hash-table";
+ case INTERNAL_MEM_BRIDGE_ALIVE_HASH_TABLE_ENTRY: return "bridge-alive-hash-table-entry";
case INTERNAL_MEM_JOB_QUEUE_ENTRY: return "job-queue-entry";
case INTERNAL_MEM_TOGGLEREF_DATA: return "toggleref-data";
default:

0 comments on commit be0ba1d

Please sign in to comment.