diff options
author | Mingyao Yang <mingyao@google.com> | 2015-04-01 22:08:37 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-01 22:08:37 +0000 |
commit | 79bdb47d8c87ca3ee7da4aa2ca56105728257a32 (patch) | |
tree | a288ba00f919fc8687dc8bfba8708756be18ab97 /compiler/optimizing/nodes.h | |
parent | d11fa65a21fd38dcd6e183cd9993b78d711b9ccf (diff) | |
parent | 0c365e674545159fd77b998081207f0685a605e5 (diff) | |
download | art-79bdb47d8c87ca3ee7da4aa2ca56105728257a32.tar.gz art-79bdb47d8c87ca3ee7da4aa2ca56105728257a32.tar.bz2 art-79bdb47d8c87ca3ee7da4aa2ca56105728257a32.zip |
Merge "CanThrow() of HNewArray should return true."
Diffstat (limited to 'compiler/optimizing/nodes.h')
-rw-r--r-- | compiler/optimizing/nodes.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 21ed3504f1..da1468ecdb 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -2307,6 +2307,9 @@ class HNewArray : public HExpression<1> { // Calls runtime so needs an environment. bool NeedsEnvironment() const OVERRIDE { return true; } + // May throw NegativeArraySizeException, OutOfMemoryError, etc. + bool CanThrow() const OVERRIDE { return true; } + bool CanBeNull() const OVERRIDE { return false; } QuickEntrypointEnum GetEntrypoint() const { return entrypoint_; } |