@@ -1484,8 +1484,10 @@ protected override IEnumerable<ValueReference> OnGetParameters (EvaluationContex
1484
1484
if ( met . IsStatic )
1485
1485
pos -- ;
1486
1486
1487
- yield return CorDebugUtil . CallHandlingComExceptions ( ( ) => CreateParameterReference ( ctx , pos , pi . Name ) ,
1487
+ var parameter = CorDebugUtil . CallHandlingComExceptions ( ( ) => CreateParameterReference ( ctx , pos , pi . Name ) ,
1488
1488
string . Format ( "Get parameter {0} of {1}" , pi . Name , met . Name ) ) ;
1489
+ if ( parameter != null )
1490
+ yield return parameter ;
1489
1491
}
1490
1492
yield break ;
1491
1493
}
@@ -1494,8 +1496,10 @@ protected override IEnumerable<ValueReference> OnGetParameters (EvaluationContex
1494
1496
int count = CorDebugUtil . CallHandlingComExceptions ( ( ) => ctx . Frame . GetArgumentCount ( ) , "GetArgumentCount()" , 0 ) ;
1495
1497
for ( int n = 0 ; n < count ; n ++ ) {
1496
1498
int locn = n ;
1497
- yield return CorDebugUtil . CallHandlingComExceptions ( ( ) => CreateParameterReference ( ctx , locn , "arg_" + ( locn + 1 ) ) ,
1499
+ var parameter = CorDebugUtil . CallHandlingComExceptions ( ( ) => CreateParameterReference ( ctx , locn , "arg_" + ( locn + 1 ) ) ,
1498
1500
string . Format ( "Get parameter {0}" , n ) ) ;
1501
+ if ( parameter != null )
1502
+ yield return parameter ;
1499
1503
}
1500
1504
}
1501
1505
@@ -1608,8 +1612,10 @@ IEnumerable<ValueReference> GetLocals (CorEvaluationContext ctx, ISymbolScope sc
1608
1612
int count = ctx . Frame . GetLocalVariablesCount ( ) ;
1609
1613
for ( int n = 0 ; n < count ; n ++ ) {
1610
1614
int locn = n ;
1611
- yield return CorDebugUtil . CallHandlingComExceptions ( ( ) => CreateLocalVariableReference ( ctx , locn , "local_" + ( locn + 1 ) ) ,
1615
+ var localVar = CorDebugUtil . CallHandlingComExceptions ( ( ) => CreateLocalVariableReference ( ctx , locn , "local_" + ( locn + 1 ) ) ,
1612
1616
string . Format ( "Get local variable {0}" , locn ) ) ;
1617
+ if ( localVar != null )
1618
+ yield return localVar ;
1613
1619
}
1614
1620
yield break ;
1615
1621
}
0 commit comments