summaryrefslogtreecommitdiffstats
path: root/src/regexp-macro-assembler-irregexp.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-06-13 19:13:29 +0100
committerSteve Block <steveblock@google.com>2011-06-13 19:47:33 +0100
commit053d10c438f14580aaf4ab1b2aad93a5a4fe8b82 (patch)
tree252c105b821e8370a0cc06c168f909e9817a3ebb /src/regexp-macro-assembler-irregexp.h
parent442c3c4c26c4d864ad9a4948f856e706e77c3cd2 (diff)
downloadandroid_external_v8-053d10c438f14580aaf4ab1b2aad93a5a4fe8b82.tar.gz
android_external_v8-053d10c438f14580aaf4ab1b2aad93a5a4fe8b82.tar.bz2
android_external_v8-053d10c438f14580aaf4ab1b2aad93a5a4fe8b82.zip
Merge V8 at branches/3.2 r8200: Initial merge by Git
Change-Id: I5c434306e98132997e9c5f6024b6ce200b255edf
Diffstat (limited to 'src/regexp-macro-assembler-irregexp.h')
-rw-r--r--src/regexp-macro-assembler-irregexp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/regexp-macro-assembler-irregexp.h b/src/regexp-macro-assembler-irregexp.h
index 9deea86f..75cf8bf9 100644
--- a/src/regexp-macro-assembler-irregexp.h
+++ b/src/regexp-macro-assembler-irregexp.h
@@ -106,7 +106,7 @@ class RegExpMacroAssemblerIrregexp: public RegExpMacroAssembler {
virtual void IfRegisterEqPos(int register_index, Label* if_eq);
virtual IrregexpImplementation Implementation();
- virtual Handle<Object> GetCode(Handle<String> source);
+ virtual Handle<HeapObject> GetCode(Handle<String> source);
private:
void Expand();
// Code and bitmap emission.