summaryrefslogtreecommitdiff
path: root/src/proguard/optimize/peephole/InstructionSequenceReplacer.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/proguard/optimize/peephole/InstructionSequenceReplacer.java')
-rw-r--r--src/proguard/optimize/peephole/InstructionSequenceReplacer.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/proguard/optimize/peephole/InstructionSequenceReplacer.java b/src/proguard/optimize/peephole/InstructionSequenceReplacer.java
index 7ec1a95..6a1d872 100644
--- a/src/proguard/optimize/peephole/InstructionSequenceReplacer.java
+++ b/src/proguard/optimize/peephole/InstructionSequenceReplacer.java
@@ -2,7 +2,7 @@
* ProGuard -- shrinking, optimization, obfuscation, and preverification
* of Java bytecode.
*
- * Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2014 Eric Lafortune (eric@graphics.cornell.edu)
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -153,7 +153,8 @@ implements InstructionVisitor,
{
// Reset the instruction sequence matcher if the instruction is a branch
// target or if it has already been modified.
- if (branchTargetFinder.isTarget(offset) ||
+ if ((branchTargetFinder != null &&
+ branchTargetFinder.isTarget(offset)) ||
codeAttributeEditor.isModified(offset))
{
instructionSequenceMatcher.reset();