From 5052a6ff964bd6df935bc8279097c2ff6db1e4cf Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 14 May 2016 23:34:47 -0700 Subject: 2959 --- 057shape_shifting_container.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to '057shape_shifting_container.cc') diff --git a/057shape_shifting_container.cc b/057shape_shifting_container.cc index 07848600..d1feb0fb 100644 --- a/057shape_shifting_container.cc +++ b/057shape_shifting_container.cc @@ -252,7 +252,16 @@ replace_type_ingredients(element, type, info); :(before "Compute Exclusive Container Size(element)") replace_type_ingredients(element, type, info); :(before "Compute Container Address Offset(element)") -replace_type_ingredients(element, type, info); +replace_type_ingredients(element, curr_type, curr_info); +if (contains_type_ingredient(element)) { + // error raised elsewhere; just clean up and leave + while (!containers.empty()) { + delete containers.top().first; + containers.pop(); + } + return; +} + :(code) void replace_type_ingredients(reagent& element, const type_tree* caller_type, const type_info& info) { if (contains_type_ingredient(element)) { -- cgit 1.4.1-2-gfad0 K. Agaram <vc@akkartik.com>

about summary refs log tree commit diff stats

path: root/tools/browse_trace

blob: e68b541b9fa1fd0a47e1e62a7de484d0b0fd26c3 (plain) (blame)