diff options
author | Nathan Ridge | 2018-06-06 13:02:57 +0000 |
---|---|---|
committer | Nathan Ridge | 2018-06-15 04:09:26 +0000 |
commit | 8792d9d5a6545fb938fe3bc92dc5825ee35c142d (patch) | |
tree | b44cba2c74f506662ee45c1b43f6b1b5bc395f1b | |
parent | 2ca147ebf134be986a21b724291a33cbfba9d5ee (diff) | |
download | org.eclipse.cdt-8792d9d5a6545fb938fe3bc92dc5825ee35c142d.tar.gz org.eclipse.cdt-8792d9d5a6545fb938fe3bc92dc5825ee35c142d.tar.xz org.eclipse.cdt-8792d9d5a6545fb938fe3bc92dc5825ee35c142d.zip |
Bug 535557 - Avoid setting a null lookup point in SizeofCalculator.sizeAndAlignment()
Change-Id: I50974c7b74ef511aae96e2ce2a9a3b96ecbdb594
-rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java index 394325854c5..699d450aa62 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java @@ -291,7 +291,9 @@ public class SizeofCalculator { int maxAlignment = 1; IField[] fields; if (type instanceof ICPPClassType) { - CPPSemantics.pushLookupPoint(ast); + if (ast != null) { + CPPSemantics.pushLookupPoint(ast); + } try { ICPPClassType classType = (ICPPClassType) type; for (ICPPBase base : classType.getBases()) { @@ -315,7 +317,9 @@ public class SizeofCalculator { } fields = classType.getDeclaredFields(); } finally { - CPPSemantics.popLookupPoint(); + if (ast != null) { + CPPSemantics.popLookupPoint(); + } } } else { fields = type.getFields(); |